-migliorata gestione griglia dinamica

- ricompilazione con cambio versione.

AboutBoxWindow/AboutBoxView.xaml

@@ -1,8 +1,8 @@
 <Window x:Class="AboutBoxWndV"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-        ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
+    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
@@ -13,8 +13,8 @@
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1.75*"/>
-            <RowDefinition Height="0.15*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.25*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
@@ -31,19 +31,19 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/AboutBox/EgalwareLogo.png" Stretch="Uniform"/>
+               <Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="18" />
+               VerticalAlignment="Center" FontSize="18" />
          <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="18"/>
+               VerticalAlignment="Center" FontSize="18"/>
          <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="12" />
+               VerticalAlignment="Center" FontSize="12" />
          <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
+               VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
          <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-                 Margin="100,0"/>
+               Margin="100,0"/>
 
       </Grid>
 

AboutBoxWindow/AboutBoxView.xaml.vb

@@ -30,7 +30,7 @@ Public Class AboutBoxWndV
                "  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 &= "SupportPlan " & sAssStatus & Environment.NewLine
       sInfo &= "DataRoot " & IniFile.m_sDataRoot & Environment.NewLine
       If IniFile.m_ProjectMode <> ProjectModeOpt.ONLYDRAW Then
          sInfo &= "MachinesRoot " & IniFile.m_sMachinesRoot & Environment.NewLine
@@ -70,6 +70,24 @@ Public Class AboutBoxWndV
          IniFile.GetSpecialLuaVersion( IniFile.m_sDoorsDirPath, sVersion) 
          sInfo &= Environment.NewLine & "Doors ver. " & sVersion & "   " & IniFile.m_sDoorsDirPath
       End If
+      If IniFile.IsActiveWindow() Then
+         bExtensions = True
+         Dim sVersion As String = "---"
+         IniFile.GetSpecialLuaVersion( IniFile.m_sWindowDirPath, sVersion) 
+         sInfo &= Environment.NewLine & "Window ver. " & sVersion & "   " & IniFile.m_sWindowDirPath
+      End If
+      If IniFile.IsActiveTrimming() Then
+         bExtensions = True
+         Dim sVersion As String = "---"
+         IniFile.GetSpecialLuaVersion( IniFile.m_sTrimmingDirPath, sVersion) 
+         sInfo &= Environment.NewLine & "Trimming ver. " & sVersion & "   " & IniFile.m_sTrimmingDirPath
+      End If
+      If IniFile.IsActiveReversePost() Then
+         bExtensions = True
+         Dim sVersion As String = "---"
+         IniFile.GetSpecialLuaVersion( IniFile.m_sReversePostDirPath, sVersion) 
+         sInfo &= Environment.NewLine & "ReversePost ver. " & sVersion & "   " & IniFile.m_sReversePostDirPath
+      End If
       If IniFile.IsActiveGunStock() Then
          bExtensions = True
          Dim sVersion As String = "---"
@@ -78,7 +96,7 @@ Public Class AboutBoxWndV
       End If
       If Not bExtensions Then sInfo &= Environment.NewLine & "---"
       InfoLbl.Text = sInfo
-      ExitBtn.Content = EgtMsg(10104)          'Ok
+      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
    End Sub
 
 End Class

Application.xaml.vb

@@ -210,8 +210,7 @@ Class Application
    Friend Const GUNSTOCKMODIF As String = "GunStockModif"
 
    Private Sub Application_DispatcherUnhandledException(ByVal sender As System.Object, ByVal e As System.Windows.Threading.DispatcherUnhandledExceptionEventArgs)
-      'MessageBox.Show(e.Exception.Message)
-      EgtMessageBoxV.Show(Application.Current.MainWindow, e.Exception.Message)
+      MessageBox.Show(e.Exception.Message)
       e.Handled = True
    End Sub
 

AttachedBehaviours/AutomaticCloseExpander.vb

@@ -88,6 +88,49 @@ Public Class AutomaticCloseExpander
             Exit For
          End If
       Next
+
+
+      'Dim TotalDimension As Double = 0
+      ''Aggiungo la dimensione di tutti gli Header
+      'For Each Expander In ExpanderList
+      '   If Expander IsNot SelectedExpander Then
+      '      If Not Expander.IsExpanded Then
+      '         TotalDimension += Expander.ActualHeight
+      '      Else
+      '         Dim ExpanderContent As FrameworkElement = DirectCast(Expander.Content, FrameworkElement)
+      '         ExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+      '         TotalDimension += (Expander.ActualHeight - ExpanderContent.DesiredSize.Height)
+      '      End If
+      '   Else
+      '      TotalDimension += Expander.ActualHeight
+      '   End If
+      'Next
+      '' Aggiungo la dimensione dei controlli fissi (non Expander)
+      'For Each OtherControl In OtherControlList
+      '   TotalDimension += OtherControl.ActualHeight
+      'Next
+      '' Aggiungo la dimensione del contenuto dell'expander selezionato
+      'Dim SelectedContent As FrameworkElement = DirectCast(SelectedExpander.Content, FrameworkElement)
+      'SelectedContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+      'TotalDimension += SelectedContent.DesiredSize.Height
+      '' Verifico per tutti gli expander (tranne quello selezionato) a partire dal primo se sono espansi e nel caso se la loro dimensione totale li fa stare nello spazio disponibile
+      'Dim Index As Integer = 0
+      'For Index = 0 To ExpanderList.Count - 1
+      '   If ExpanderList(Index) IsNot SelectedExpander Then
+      '      If ExpanderList(Index).IsExpanded Then
+      '         Dim ExpanderContent As FrameworkElement = DirectCast(ExpanderList(Index).Content, FrameworkElement)
+      '         TotalDimension += ExpanderContent.ActualHeight
+      '         If TotalDimension > Me.AssociatedObject.MaxHeight Then
+      '            Exit For
+      '         End If
+      '      End If
+      '   End If
+      'Next
+      'For CancelIndex = Index To ExpanderList.Count - 1
+      '   If ExpanderList(CancelIndex) IsNot SelectedExpander Then
+      '      ExpanderList(CancelIndex).IsExpanded = False
+      '   End If
+      'Next
    End Sub
 
    Private Sub HorizontalVerifyDimension(SelectedExpander As Expander)

AttachedBehaviours/InputBindingsManager.vb

@@ -58,5 +58,4 @@
          binding.UpdateSource()
       End If
    End Sub
-
 End Class

Base/TabViewModel.vb

@@ -9,7 +9,7 @@
       Set(value As String)
          If value <> m_sTabName Then
             m_sTabName = value
-            OnPropertyChanged(NameOf(sTabName))
+            OnPropertyChanged("sTabName")
          End If
       End Set
    End Property

Base/TreeView/TreeViewItemBase.vb

@@ -1,7 +1,5 @@
 Imports System.Collections.ObjectModel
 Imports System.ComponentModel
-Imports EgtUILib
-Imports EgtUILib.EgtInterface
 
 ' Classe che definisce un elemento di base del TreeView
 Public Class TreeViewItemBase
@@ -15,7 +13,7 @@ Public Class TreeViewItemBase
       Set(value As String)
          If (value <> m_Name) Then
             m_Name = value
-            NotifyPropertyChanged(NameOf(Name))
+            NotifyPropertyChanged("Name")
          End If
       End Set
    End Property
@@ -28,39 +26,20 @@ Public Class TreeViewItemBase
       Set(value As Boolean)
          If (value <> m_isSelected) Then
             m_isSelected = value
-            NotifyPropertyChanged(NameOf(IsSelected))
+            NotifyPropertyChanged("IsSelected")
          End If
       End Set
    End Property
 
    Friend m_isExpanded As Boolean
-   Public Property IsExpanded As Boolean
+   Public  Property IsExpanded As Boolean
       Get
          Return m_isExpanded
       End Get
       Set(value As Boolean)
          If (value <> m_isExpanded) Then
             m_isExpanded = value
-            If Not Map.refProjectVM.bSelObjOnScene Then
-               Dim m_onldObjTreeOldId As Integer = Map.refManageLayerExpanderVM.m_nObjTreeOldId
-               If Not m_isExpanded Then
-               Else
-                  For Each Item As LayerTreeViewItem In Map.refManageLayerExpanderVM.LayerList
-                     For Each LayerItem As LayerTreeViewItem In Item.Items
-                        If m_isExpanded = LayerItem.m_isExpanded Then
-                           If m_onldObjTreeOldId = LayerItem.Id Then
-                              Map.refProjectVM.SetLastInteger(LayerItem.Id)
-                              'Map.refProjectVM.ExecuteCommand(Controller.CMD.DESELECTPARTLAYEROBJ)
-                              'Else
-                              'Map.refManageLayerExpanderVM.SelectIdInObjTree(LayerItem.Id)
-                              'Map.refProjectVM.ExecuteCommand(Controller.CMD.SETCURRPARTLAYER)
-                           End If
-                        End If
-                     Next
-                  Next
-               End If
-            End If
-            NotifyPropertyChanged(NameOf(IsExpanded))
+            NotifyPropertyChanged("IsExpanded")
          End If
       End Set
    End Property
@@ -73,7 +52,7 @@ Public Class TreeViewItemBase
       Set(value As Boolean)
          If value <> m_IsActive Then
             m_IsActive = value
-            NotifyPropertyChanged(NameOf(IsActive))
+            NotifyPropertyChanged("IsActive")
          End If
       End Set
    End Property
@@ -85,7 +64,7 @@ Public Class TreeViewItemBase
       End Get
       Set(value As Boolean)
          m_IsEnabled = value
-         NotifyPropertyChanged(NameOf(IsEnabled))
+         NotifyPropertyChanged("IsEnabled")
       End Set
    End Property
 
@@ -121,7 +100,7 @@ Public Class InheritableTreeViewItem
       Set(value As String)
          If (value <> m_Name) Then
             m_Name = value
-            NotifyPropertyChanged(NameOf(Name))
+            NotifyPropertyChanged("Name")
          End If
       End Set
    End Property
@@ -134,7 +113,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If (value <> m_IsSelected) Then
             m_IsSelected = value
-            NotifyPropertyChanged(NameOf(IsSelected))
+            NotifyPropertyChanged("IsSelected")
          End If
       End Set
    End Property
@@ -147,7 +126,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If (value <> m_isExpanded) Then
             m_isExpanded = value
-            NotifyPropertyChanged(NameOf(IsExpanded))
+            NotifyPropertyChanged("IsExpanded")
          End If
       End Set
    End Property
@@ -160,7 +139,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If value <> m_IsActive Then
             m_IsActive = value
-            NotifyPropertyChanged(NameOf(IsActive))
+            NotifyPropertyChanged("IsActive")
          End If
       End Set
    End Property
@@ -172,7 +151,7 @@ Public Class InheritableTreeViewItem
       End Get
       Set(value As Boolean)
          m_IsEnabled = value
-         NotifyPropertyChanged(NameOf(IsEnabled))
+         NotifyPropertyChanged("IsEnabled")
       End Set
    End Property
 
@@ -184,7 +163,7 @@ Public Class InheritableTreeViewItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged(NameOf(PictureString))
+            NotifyPropertyChanged("PictureString")
          End If
       End Set
    End Property
@@ -225,7 +204,7 @@ Public Class ParentItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged(NameOf(PictureString))
+            NotifyPropertyChanged("PictureString")
          End If
       End Set
    End Property
@@ -264,7 +243,7 @@ Public Class ChildItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged(NameOf(PictureString))
+            NotifyPropertyChanged("PictureString")
          End If
       End Set
    End Property

BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -13,7 +13,7 @@ Public Class BeamMachiningsWindowV
       m_BeamMachiningsWindowVM = BeamMachiningsWindowVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

Command/Command.vb

@@ -1,4 +1,5 @@
-''' <summary>
+
+''' <summary>
 ''' A command whose sole purpose is to 
 ''' relay its functionality to other
 ''' objects by invoking delegates. The

Constants/ConstDoors.vb

@@ -1,4 +1,5 @@
-Module ConstDoors
+
+Module ConstDoors
 
    ' File contenente la lista dei nomi di geometria ammessi
    Public Const GEONAMELIST_FILE As String = "GeometryNameList.ini"

Constants/ConstGen.vb

@@ -51,6 +51,9 @@ Module ConstGen
    ' Chiave di Info in gruppo di lavoro per none part-program
    Public Const KEY_MCHGRP_NCNAME As String = "NcName"
 
+   ' File Dimensioni Griglia CAM5
+   Public Const DIMENSION_FILE_NAME As String = "Dimension.ini"
+
    ' Costante per flag di BBox
    Public Const BBFLAG As Integer = GDB_BB.ONLY_VISIBLE + GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM
 

Constants/ConstIni.vb

@@ -73,7 +73,7 @@ Module ConstIni
    Public Const K_SELSURF As String = "SelSurf"
    Public Const K_SHOWMODE As String = "ShowMode"
    Public Const K_CURVEDIR As String = "CurveDir"
-   Public Const K_SHOWTRIAADV As String = "ShowTriaAdv"
+   Public Const K_SHOWSURFQUALITY As String = "ShowSurfQuality"
    Public Const K_SHOWZMAP As String = "ShowZmap"
    Public Const K_TEXMAXLINPIX As String = "TextureMaxLinPixels"
    Public Const K_ZOOMWIN As String = "ZoomWin"
@@ -144,10 +144,6 @@ Module ConstIni
    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"
@@ -161,6 +157,21 @@ Module ConstIni
    Public Const K_MTABLEWINPLACE As String = "MTableWinPlace"
    Public Const K_OPTIMIZEMACHFORLINE As String = "OptimizeMachForLine"
 
+   Public Const S_WINDOW As String = "Window"
+   Public Const K_WINDOWENABLE As String = "JwdEnable"
+   Public Const K_WINDOWBASEDIR As String = "BaseDir"
+   Public Const K_WINDOWBUTTON As String = "Button"
+
+   Public Const S_TRIMMING As String = "Trimming"
+   Public Const K_TRIMMINGENABLE As String = "TrimEnable"
+   Public Const K_TRIMMINGBASEDIR As String = "BaseDir"
+   Public Const K_TRIMMINGBUTTON As String = "Button"
+
+   Public Const S_REVERSEPOST As String = "ReversePost"
+   Public Const K_REVERSEPOSTENABLE As String = "RevEnable"
+   Public Const K_REVERSEPOSTBASEDIR As String = "BaseDir"
+   Public Const K_REVERSEPOSTBUTTON As String = "Button"
+
    Public Const S_GUNSTOCK As String = "GunStock"
    Public Const K_GUNSTOCKENABLE As String = "GsEnable"
    Public Const K_GUNSTOCKEXEC As String = "GsExec"
@@ -189,7 +200,8 @@ Module ConstIni
    Public Const K_SELGEOMSURFFINISHING As String = "SelGeomSurfFinishing"
    Public Const K_SELGEOMSURFROUGHING As String = "SelGeomSurfRoughing"
    Public Const K_SELGEOMFIVEAXMILLING As String = "SelGeomFiveAxMilling"
-   Public Const K_SELVMILLQUALITY As String = "VMillQuality"
+   Public Const K_SELGEOMPROBING As String = "SelGeomProbing"
+   Public Const K_VMILLQUALITY As String = "VMillQuality"
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
    Public Const K_SHOWONLYTABLE As String = "ShowOnlyTable"
    Public Const K_MOVETHROUGHDISPS As String = "MoveThroughDisps"
@@ -198,6 +210,7 @@ Module ConstIni
    Public Const S_SIMUL As String = "Simul"
    Public Const K_SLIDERX As String = "SliderX"
    Public Const K_SLIDERVAL As String = "SliderVal"
+   Public Const K_TRACEENABLE As String = "TraceEnable"
 
    Public Const S_OPTIONS As String = "Options"
    Public Const K_NEWMACHININGISLASTONE As String = "NewMachiningIsLastOne"

Constants/ConstMachIni.vb

@@ -1,6 +1,13 @@
 Module ConstMachIni
 
+   Public Const S_MCH_GENERAL As String = "General"
+   Public Const K_MATERIAL As String = "Material"
+
+   Public Const S_PARTPROGRAM As String = "PartProgram"
+   Public Const K_EXTENSION As String = "Extension"
+
    Public Const S_TOOLS As String = "Tools"
+   Public Const K_PROBE As String = "Probe"
    Public Const K_DRILLBIT As String = "Drillbit"
    Public Const K_SAWBLADE As String = "Sawblade"
    Public Const K_MILL As String = "Mill"
@@ -8,22 +15,17 @@
    Public Const K_CHISEL As String = "Chisel"
    Public Const K_WATERJET As String = "WaterJet"
    Public Const K_COMPO As String = "Compo"
-   Public Const K_SHOWTOOLCHANGER As String = "ShowToolChanger"
-   Public Const K_SHOWHEADEXIT As String = "ShowHeadExit"
-   Public Const K_DRILLHOLDER As String = "DrillHolder"
-   Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
-   Public Const K_MILLHOLDER As String = "MillHolder"
    Public Const K_DRILLMAKER As String = "DrillMaker"
    Public Const K_SAWBLADEMAKER As String = "SawbladeMaker"
    Public Const K_MILLMAKER As String = "MillMaker"
    Public Const K_MORTISEMAKER As String = "MortiseMaker"
    Public Const K_CHISELMAKER As String = "ChiselMaker"
-   Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
    Public Const K_ACTIVE As String = "Active"
 
    Public Const S_TOOLHOLDER As String = "ToolHolder"
 
    Public Const S_MACHININGS As String = "Machinings"
+   Public Const K_PROBING As String = "Probing"
    Public Const K_SAWING As String = "Sawing"
    Public Const K_DRILLING As String = "Drilling"
    Public Const K_MILLING As String = "Milling"
@@ -37,18 +39,12 @@
    Public Const K_SURFFINISHING As String = "SurfFinishing"
    Public Const K_5AXMILLING As String = "5AxMilling"
    Public Const K_WATERJETTING As String = "WaterJetting"
-   Public Const K_SAWINGONARCS As String = "SawingOnArcs"
 
    Public Const S_GENMACHINING As String = "GenMachining"
    Public Const K_GENSCRIPT As String = "GenScript"
 
-   Public Const S_TOOLCHANGER As String = "ToolChanger"
-   Public Const K_NUMBER As String = "Number"
-   Public Const K_POS As String = "Pos"
-   Public Const K_NAME As String = "Name"
-   Public Const K_MANUALNUMBER As String = "ManualNumber"
-   Public Const K_MANUALPOS As String = "ManualPos"
-   Public Const K_MANUALNAME As String = "ManualName"
+   Public Const S_5AXMILLING As String = "5AxMilling"
+   Public Const K_5AXSCRIPT As String = "5AxScript"
 
    Public Const S_DISPOSITION As String = "Disposition"
    Public Const K_DISP_INITSCRIPT As String = "InitScript"
@@ -68,7 +64,16 @@
    Public Const S_VMILL As String = "VMill"
    Public Const K_VM_ENABLE As String = "Enable"
 
+   Public Const S_TOOLTRACE As String = "ToolTrace"
+   Public Const K_TT_ENABLE As String = "Enable"
+
    Public Const S_ESTIMATIONS As String = "Estimations"
    Public Const K_EST_ENABLE As String = "Enable"
 
+   ' Tipi di materiali previsti attualmente per le macchine
+   Public Const MCH_MAT_STONE As String = "Stone"
+   Public Const MCH_MAT_WOOD As String = "Wood"
+   Public Const MCH_MAT_BEAM As String = "Beam"
+   Public Const MCH_MAT_ADDITIVE As String = "Additive"
+
 End Module

CurrSetUp/CurrSetUpV.xaml.vb

@@ -11,4 +11,8 @@
       m_CurrSetUpVM = CurrSetUpVM
    End Sub
 
+   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.OnCloseWindow
+   '   Me.DialogResult = bDialogResult
+   'End Sub
+
 End Class

CurrSetUp/CurrSetUpVM.vb

@@ -1,4 +1,6 @@
-Imports System.IO
+Imports System.Collections.ObjectModel
+Imports System.ComponentModel
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -10,7 +12,7 @@ Public Class CurrSetUpVM
    Private m_Title As String
    Public ReadOnly Property Title As String
       Get
-         Return EgtMsg(6451)     ' SetUp
+         Return EgtMsg(MSG_SETUP + 1)
       End Get
    End Property
 
@@ -52,28 +54,28 @@ Public Class CurrSetUpVM
 
    Public ReadOnly Property TitleMsg As String
       Get
-         Return EgtMsg(6451)     ' SetUp
+         Return EgtMsg(MSG_SETUP + 1)
       End Get
    End Property
 
    Public ReadOnly Property ApplyMsg As String
       Get
-         Return EgtMsg(6452)     ' Applica
+         Return EgtMsg(MSG_SETUP + 2)
       End Get
    End Property
    Public ReadOnly Property SaveMsg As String
       Get
-         Return EgtMsg(6453)     ' Salva
+         Return EgtMsg(MSG_SETUP + 3)
       End Get
    End Property
    Public ReadOnly Property RetrieveMsg As String
       Get
-         Return EgtMsg(6454)     ' Recupera
+         Return EgtMsg(MSG_SETUP + 4)
       End Get
    End Property
    Public ReadOnly Property AutomaticMsg As String
       Get
-         Return EgtMsg(6455)     ' Auto
+         Return EgtMsg(MSG_SETUP + 5)
       End Get
    End Property
 
@@ -98,7 +100,7 @@ Public Class CurrSetUpVM
    ' Funzione che verifica se ci sono state modifiche all'attrezzaggio corrente e permette di attivare e disattivare il bottone applica
    Private Sub IsEnabledBtns()
       m_Apply_IsEnabled = Not m_SetUpVM.IsAppliedSetUp()
-      NotifyPropertyChanged(NameOf(Apply_IsEnabled))
+      NotifyPropertyChanged("Apply_IsEnabled")
    End Sub
 
 #Region "COMMANDS"
@@ -149,7 +151,7 @@ Public Class CurrSetUpVM
    Public Sub Save()
       ' chiedo il nome con cui salvare il setup
       Dim SaveFileDialogViewVM As New SaveFileDialogWithListVM With {
-         .Title = EgtMsg(6453) & " " & EgtMsg(6451),     ' Salva SetUp
+         .Title = EgtMsg(MSG_SETUP + 3) & " " & EgtMsg(MSG_SETUP + 1),
          .Extension = ".stu",
          .Filter = "*.stu",
          .Directory = m_SetUpDir_FilePath,
@@ -161,8 +163,7 @@ Public Class CurrSetUpVM
       sFilePath = SaveFileDialogViewVM.FileName
       If Not m_SetUpVM.Save(sFilePath) Then
          EgtOutLog("Error in setup saving: can't find the directory")
-         'MessageBox.Show("Error in saving Setup.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, "Error in saving Setup.", EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Errore
+         MessageBox.Show("Error in saving Setup.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
       End If
    End Sub
 
@@ -194,12 +195,11 @@ Public Class CurrSetUpVM
          Return
       End If
       ' Apertura dialogo di salvataggio
-      Dim OpenFileDialogView As New EgtWPFLib5.EgtOpenFileDialog With {
-         .Title = EgtMsg(6454) & " " & EgtMsg(6451),     ' Recupera SetUp
-         .Filter = "*.stu",
-         .Directory = sDir,
-         .FileName = String.Empty
-      }
+      Dim OpenFileDialogView As New EgtWPFLib5.EgtOpenFileDialog
+      OpenFileDialogView.Title = EgtMsg(MSG_SETUP + 4) & " " & EgtMsg(MSG_SETUP + 1)
+      OpenFileDialogView.Filter = "*.stu"
+      OpenFileDialogView.Directory = sDir
+      OpenFileDialogView.FileName = String.Empty
       If Not OpenFileDialogView.EgtShowDialog Then
          Return
       End If
@@ -258,15 +258,14 @@ Public Class CurrSetUpVM
       ' Verifico se l'attrezzaggio è stato modificato
       If m_SetUpVM.IsAppliedSetUp() Then
          ' se modificato chiedo se salvarlo prima di uscire
-         'If MessageBox.Show(EgtMsg(MSG_SETUP + 6), EgtMsg(MSG_SETUP + 2), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
-         If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6456), EgtMsg(6452), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then  ' Applicare l'attrezzaggio corrente prima di uscire? Applica
+         If MessageBox.Show(EgtMsg(MSG_SETUP + 6), EgtMsg(MSG_SETUP + 2), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
             ' lo salvo
             Apply()
          End If
       End If
 
-         ' Resetto tutti i delegate usati
-         ExitToolAssociation.m_delIsModifiedSetUp = Nothing
+      ' Resetto tutti i delegate usati
+      ExitToolAssociation.m_delIsModifiedSetUp = Nothing
       ' Reset lua
       EgtLuaResetGlobVar("STU")
 

DrawPanel/DrawPanelV.xaml

@@ -9,89 +9,101 @@
 
    <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Expander Name="Draw2D" Style="{StaticResource ExpanderStyle}" Grid.Row="0"
-                IsExpanded="{Binding Draw2DIsExpanded}">
+         IsExpanded="{Binding Draw2DIsExpanded}">
          <Expander.Header>
             <TextBlock Text="{Binding Draw2DMsg}"/>
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Line2PToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding LinePDLToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinePDL.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcCSEToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcCSE.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding Arc2PRToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Arc2PRCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Arc2PR.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding Arc3PToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Arc3P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcPDPToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
+            <Button ToolTip="{Binding BiArcToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding BiArcCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/BiArc.png" Stretch="Uniform"/>
+            </Button>
+            <Button Style="{StaticResource DrawPanelButton}"
+                    Visibility="Hidden"/>
+            <Button ToolTip="{Binding CircleCPToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCP.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding Circle3PToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Circle3P.png" Stretch="Uniform"/>
-            </Button>
             <Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding Circle3PToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Circle3P.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding Rectangle2PToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Rectangle2P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding PolygonToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Polygon.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding PolygonSideToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               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}">
+               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}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -103,93 +115,93 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtrudeToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding RevolveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Revolve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ScrewToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Screw.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SweptToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Swept.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding RuledToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Ruled.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidAddSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidAddSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidSubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidIntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding IntersectSurfSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/IntersectSurfSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractLoops.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractFacetLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractFacetLoops.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExplodeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractSurfFacetToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractSurfFacet.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding MergeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/MergeSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding InvertSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               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}">
+               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}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -200,123 +212,123 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeLayerToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeStatusCommand}" IsEnabled="{Binding bSelOk}">
+               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}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeColor.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeAlphaToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeColorAlpha.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ResetColorToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/RemoveColor.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding InvertCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeStartToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True" 
-                    Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True" 
+               Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtendCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtendCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding BreakCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/BreakCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SplitCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SplitCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExplodeCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding JoinCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Offset.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding FilletToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Fillet.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChamferToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcFlipToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
-            </Button>
+             </Button>
+             <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                ToolTipService.ShowOnDisabled="True"
+                Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
+                <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+             </Button>
+             <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                ToolTipService.ShowOnDisabled="True"
+                Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
+                <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+             </Button>
             <Button ToolTip="{Binding ApproxCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               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}">
+               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}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyText.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -327,8 +339,8 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
             </Button>
             <Button Style="{StaticResource DrawPanelButton}"
@@ -336,33 +348,33 @@
             <Button Style="{StaticResource DrawPanelButton}"
                     Visibility="Hidden"/>
             <Button ToolTip="{Binding RotateToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding MirrorToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ScaleToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Rotate3DToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Rotate3D.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Mirror3DToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror3D.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Scale3DToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale3D.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>

DrawPanel/DrawPanelVM.vb

@@ -11,22 +11,22 @@ Public Class DrawPanelVM
 
    Public ReadOnly Property Draw2DMsg As String
       Get
-         Return EgtMsg(5244)     ' Disegno 2D
+         Return EgtMsg(MSG_DRAWPANEL + 44)
       End Get
    End Property
    Public ReadOnly Property Draw3DMsg As String
       Get
-         Return EgtMsg(5245)     ' Disegno 3D
+         Return EgtMsg(MSG_DRAWPANEL + 45)
       End Get
    End Property
    Public ReadOnly Property ModifyMsg As String
       Get
-         Return EgtMsg(5246)     ' Modifica
+         Return EgtMsg(MSG_DRAWPANEL + 46)
       End Get
    End Property
    Public ReadOnly Property TransformMsg As String
       Get
-         Return EgtMsg(5247)     ' Trasforma
+         Return EgtMsg(MSG_DRAWPANEL + 47)
       End Get
    End Property
 
@@ -37,331 +37,342 @@ Public Class DrawPanelVM
    'Proprietà ToolTip
    Public ReadOnly Property PointToolTip As String
       Get
-         Return EgtMsg(5201)     ' Punto<br/>Vettore (Shift)<br/>Riferimento (Ctrl)
+         Return EgtMsg(MSG_DRAWPANEL + 1)
       End Get
    End Property
    Public ReadOnly Property Line2PToolTip As String
       Get
-         Return EgtMsg(5202)     ' Linea 2 Punti<br/>Linea 2 Punti con Continuazione (Ctrl)
+         Return EgtMsg(MSG_DRAWPANEL + 2)
       End Get
    End Property
    Public ReadOnly Property LinePDLToolTip As String
       Get
-         Return EgtMsg(5203)     ' Linea Punto Direzione Lunghezza<br/>Linea Punto Vettore Direzione Lunghezza (Shift)
+         Return EgtMsg(MSG_DRAWPANEL + 3)
       End Get
    End Property
-   Public ReadOnly Property CirclePDToolTip As String
+   Public ReadOnly Property CircleCPToolTip As String
       Get
-         Return EgtMsg(5204)     ' Cerchio Centro Punto
+         Return EgtMsg(MSG_DRAWPANEL + 4)
       End Get
    End Property
    Public ReadOnly Property CircleCDToolTip As String
       Get
-         Return EgtMsg(5205)     ' Cerchio Centro Diametro
+         Return EgtMsg(MSG_DRAWPANEL + 5)
       End Get
    End Property
    Public ReadOnly Property Circle3PToolTip As String
       Get
-         Return EgtMsg(5156)     ' Cerchio 3 Punti
+         Return EgtMsg(5156)
       End Get
    End Property
    Public ReadOnly Property ArcCSEToolTip As String
       Get
-         Return EgtMsg(5206)     ' Arco Centro Punti Inizio e Fine
+         Return EgtMsg(MSG_DRAWPANEL + 6)
       End Get
    End Property
    Public ReadOnly Property Arc3PToolTip As String
       Get
-         Return EgtMsg(5207)     ' Arco 3 Punti<br/>Arco 2 Punti Raggio (Shift)
+         Return EgtMsg(5207)
+      End Get
+   End Property
+   Public ReadOnly Property Arc2PRToolTip As String
+      Get
+         Return EgtMsg(5169)
       End Get
    End Property
    Public ReadOnly Property ArcPDPToolTip As String
       Get
-         Return EgtMsg(5208)     ' Arco Punto e Direzione Inizio Punto Fine<br/>Arco Punto e Vettore Direzione Inizio Punto Fine (Shift)<br/>Arco Punto e Direzione Inizio Punto Fine con Continuazione (Ctrl)
+         Return EgtMsg(MSG_DRAWPANEL + 8)
+      End Get
+   End Property  
+   Public ReadOnly Property BiArcToolTip As String
+      Get
+         Return EgtMsg(5170)
       End Get
    End Property
+
    Public ReadOnly Property Rectangle2PToolTip As String
       Get
-         Return EgtMsg(5211)     ' Rettangolo 2 Punti
+         Return EgtMsg(MSG_DRAWPANEL + 11)
       End Get
    End Property
    Public ReadOnly Property PolygonToolTip As String
       Get
-         Return EgtMsg(5212)     ' Poligono
+         Return EgtMsg(MSG_DRAWPANEL + 12)
       End Get
    End Property
    Public ReadOnly Property PolygonSideToolTip As String
       Get
-         Return EgtMsg(5213)     ' Poligono da Lato
+         Return EgtMsg(MSG_DRAWPANEL + 13)
       End Get
    End Property
    Public ReadOnly Property TextToolTip As String
       Get
-         Return EgtMsg(5214)    ' Testo<br/>Testo Avanzato (Shift)
+         Return EgtMsg( 5214)       ' Testo<br/>Testo Avanzato (Shift)
       End Get
    End Property
    Public ReadOnly Property LinearDimensionToolTip As String
       Get
-         Return EgtMsg(5155)    ' Quota Lineare<br/>Quota Allineata (Shift)
+         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)
+         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)
+         Return EgtMsg( 5168)       ' Quota Diametrale<br/>Quota Radiale (Shift)
       End Get
    End Property
 
    Public ReadOnly Property PlaneToolTip As String
       Get
-         Return EgtMsg(5215)     ' Piano contornato<br/>Regione piana (Shift)
+         Return EgtMsg(MSG_DRAWPANEL + 15)
       End Get
    End Property
    Public ReadOnly Property ExtrudeToolTip As String
       Get
-         Return EgtMsg(5216)     ' Estrusione
+         Return EgtMsg(MSG_DRAWPANEL + 16)
       End Get
    End Property
    Public ReadOnly Property RevolveToolTip As String
       Get
-         Return EgtMsg(5217)     ' Rivoluzione
+         Return EgtMsg(MSG_DRAWPANEL + 17)
       End Get
    End Property
    Public ReadOnly Property ScrewToolTip As String
       Get
-         Return EgtMsg(5218)     ' Avvitamento
+         Return EgtMsg(MSG_DRAWPANEL + 18)
       End Get
    End Property
    Public ReadOnly Property SweptToolTip As String
       Get
-         Return EgtMsg(5248)     ' Swept (Sezione, Guida)
+         Return EgtMsg(MSG_DRAWPANEL + 48)
       End Get
    End Property
    Public ReadOnly Property RuledToolTip As String
       Get
-         Return EgtMsg(5219)     ' Rigata
+         Return EgtMsg(MSG_DRAWPANEL + 19)
       End Get
    End Property
    Public ReadOnly Property MergeSurfToolTip As String
       Get
-         Return EgtMsg(5220)     ' Unisci Superfici
+         Return EgtMsg(MSG_DRAWPANEL + 20)
       End Get
    End Property
    Public ReadOnly Property ExplodeSurfToolTip As String
       Get
-         Return EgtMsg(5221)     ' Esplodi Superfici e Regioni Piane
+         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
+         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)
+         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
+         Return EgtMsg( 5158)         'Estrai Faccia da Superficie
       End Get
    End Property
    Public ReadOnly Property InvertSurfToolTip As String
       Get
-         Return EgtMsg(5222)     ' Inverti Superfici e Regioni Piane
+         Return EgtMsg( 5222)         'Inverti Superfici e Regioni Piane
       End Get
    End Property
    Public ReadOnly Property ExtractLoopsToolTip As String
       Get
-         Return EgtMsg(5150)     ' Estrai Bordi Liberi di Superfici e Regioni Piane
+         Return EgtMsg( 5150)         'Estrai Bordi Liberi di Superfici e Regioni Piane
       End Get
    End Property
    Public ReadOnly Property ExtractFacetLoopsToolTip As String
       Get
-         Return EgtMsg(5157)     ' Estrai Bordi di Faccia di superficie e di Parti di Regioni Piane
+         Return EgtMsg( 5157)         'Estrai Bordi di Faccia di superficie e di Parti di Regioni Piane
       End Get
    End Property
    Public ReadOnly Property SolidAddSurfToolTip As String
       Get
-         Return EgtMsg(5151)     ' Unisci Superfici e Regioni Piane
+         Return EgtMsg( 5151)         'Unisci Superfici e Regioni Piane
       End Get
    End Property
    Public ReadOnly Property SolidSubtractSurfToolTip As String
       Get
-         Return EgtMsg(5152)     ' Sottrai Superfici e Regioni Piane
+         Return EgtMsg( 5152)         'Sottrai Superfici e Regioni Piane
       End Get
    End Property
    Public ReadOnly Property SolidIntersectSurfToolTip As String
       Get
-         Return EgtMsg(5153)     ' Interseca Superfici e Regioni Piane
+         Return EgtMsg( 5153)         'Interseca Superfici e Regioni Piane
       End Get
    End Property
    Public ReadOnly Property IntersectSurfSurfToolTip As String
       Get
-         Return EgtMsg(5154)     ' Punti, Curve e Facce di Intersezione Tra Superfici
+         Return EgtMsg( 5154)         'Punti, Curve e Facce di Intersezione Tra Superfici
       End Get
    End Property
 
    Public ReadOnly Property DeleteToolTip As String
       Get
-         Return EgtMsg(5223)     ' Cancella
+         Return EgtMsg(MSG_DRAWPANEL + 23)
       End Get
    End Property
    Public ReadOnly Property ChangeLayerToolTip As String
       Get
-         Return EgtMsg(5224)     ' Cambia Layer<br/>Cambia Layer con Trasformazioni (Shift)
+         Return EgtMsg(MSG_DRAWPANEL + 24)
       End Get
    End Property
    Public ReadOnly Property ChangeStatusToolTip As String
       Get
-         Return EgtMsg(5250)     ' Nascondi<br/>Visualizza Layer (Shift)<br/>Visualizza Pezzo (Ctrl)
+         Return EgtMsg(5250)
       End Get
    End Property
 
    Public ReadOnly Property ChangeAlphaToolTip As String
       Get
-         Return EgtMsg(5225)     ' Cambia Trasparenza
+         Return EgtMsg(MSG_DRAWPANEL + 25)
       End Get
    End Property
    Public ReadOnly Property ResetColorToolTip As String
       Get
-         Return EgtMsg(5226)     ' Annulla Colore
+         Return EgtMsg(MSG_DRAWPANEL + 26)
       End Get
    End Property
    Public ReadOnly Property ChangeColorToolTip As String
       Get
-         Return EgtMsg(5227)     ' Cambia Colore
+         Return EgtMsg(MSG_DRAWPANEL + 27)
       End Get
    End Property
    Public ReadOnly Property InvertCurveToolTip As String
       Get
-         Return EgtMsg(5228)     ' Inverti Curva
+         Return EgtMsg(MSG_DRAWPANEL + 28)
       End Get
    End Property
    Public ReadOnly Property ChangeStartToolTip As String
       Get
-         Return EgtMsg(5229)     ' Cambia Punto Iniziale di Curva Chiusa
+         Return EgtMsg(MSG_DRAWPANEL + 29)
       End Get
    End Property
    Public ReadOnly Property ExtendCurveToolTip As String
       Get
-         Return EgtMsg(5230)     ' Estendi o Accorcia Curva
+         Return EgtMsg(MSG_DRAWPANEL + 30)
       End Get
    End Property
    Public ReadOnly Property BreakCurveToolTip As String
       Get
-         Return EgtMsg(5231)     ' Spezza Curva
+         Return EgtMsg(MSG_DRAWPANEL + 31)
       End Get
    End Property
    Public ReadOnly Property SplitCurveToolTip As String
       Get
-         Return EgtMsg(5232)     ' Dividi Curva
+         Return EgtMsg(MSG_DRAWPANEL + 32)
       End Get
    End Property
    Public ReadOnly Property JoinCurveToolTip As String
       Get
-         Return EgtMsg(5233)     ' Unisci Curve<br/>Unisci Curve creando una Copia (Shift)<br/>Fondi Curve nella Composita (Ctrl)
+         Return EgtMsg(MSG_DRAWPANEL + 33)
       End Get
    End Property
    Public ReadOnly Property ExplodeCurveToolTip As String
       Get
-         Return EgtMsg(5234)     ' Esplodi Curve e Testi
+         Return EgtMsg(MSG_DRAWPANEL + 34)
       End Get
    End Property
    Public ReadOnly Property ThickCurveToolTip As String
       Get
-         Return EgtMsg(5235)     ' Spessore e Estrusione Curva
+         Return EgtMsg(MSG_DRAWPANEL + 35)
       End Get
    End Property
    Public ReadOnly Property FilletToolTip As String
       Get
-         Return EgtMsg(5209)     ' Raccordo
+         Return EgtMsg(MSG_DRAWPANEL + 9)
       End Get
    End Property
    Public ReadOnly Property ChamferToolTip As String
       Get
-         Return EgtMsg(5210)     ' Smusso
+         Return EgtMsg(MSG_DRAWPANEL + 10)
       End Get
    End Property
    Public ReadOnly Property ArcFlipToolTip As String
       Get
-         Return EgtMsg(5159)     ' Arco Capovolto<br/>Arco Esplementare (Shift)
+         Return EgtMsg( 5159)
       End Get
    End Property
    Public ReadOnly Property OffsetToolTip As String
       Get
-         Return EgtMsg(5243)     ' Offset
+         Return EgtMsg(MSG_DRAWPANEL + 43)
       End Get
    End Property
    Public ReadOnly Property ModifyCurveToolTip As String
       Get
-         Return EgtMsg(5160)     ' Modifica forma
+         Return EgtMsg( 5160)
       End Get
    End Property
    Public ReadOnly Property AddPointCurveToolTip As String
       Get
-         Return EgtMsg(5161)     ' Aggiungi Punto<br/>Trasforma in Arco (Shift)<br/>Chiudi Curva Composita (Ctrl)
+         Return EgtMsg( 5161)
       End Get
    End Property
    Public ReadOnly Property RemovePointCurveToolTip As String
       Get
-         Return EgtMsg(5162)     ' Rimuovi Punto<br/>Trasforma in Retta (Shift)<br/>Apri Curva Composita (Ctrl)
+         Return EgtMsg( 5162)
       End Get
    End Property
    Public ReadOnly Property ApproxCurveToolTip As String
       Get
-         Return EgtMsg(5163)     ' Approssima Curva<br/>Approssima Curva con Linee (Shift)
+         Return EgtMsg(5163)
       End Get
    End Property
    Public ReadOnly Property ModifyArcRadiusToolTip As String
       Get
-         Return EgtMsg(5164)     ' Modifica Raggio di Arco o Circonferenza
+         Return EgtMsg(5164)
       End Get
    End Property
    Public ReadOnly Property ModifyTextToolTip As String
       Get
-         Return EgtMsg(5249)     ' Modifica Testo
+         Return EgtMsg(5249)
       End Get
    End Property
 
    Public ReadOnly Property MoveToolTip As String
       Get
-         Return EgtMsg(5236)     ' Muovi
+         Return EgtMsg(MSG_DRAWPANEL + 36)
       End Get
    End Property
    Public ReadOnly Property RotateToolTip As String
       Get
-         Return EgtMsg(5237)     ' Ruota
+         Return EgtMsg(MSG_DRAWPANEL + 37)
       End Get
    End Property
    Public ReadOnly Property Rotate3DToolTip As String
       Get
-         Return EgtMsg(5238)     ' Ruota 3D
+         Return EgtMsg(MSG_DRAWPANEL + 38)
       End Get
    End Property
    Public ReadOnly Property MirrorToolTip As String
       Get
-         Return EgtMsg(5239)     ' Specchia
+         Return EgtMsg(MSG_DRAWPANEL + 39)
       End Get
    End Property
    Public ReadOnly Property Mirror3DToolTip As String
       Get
-         Return EgtMsg(5240)     ' Specchia 3D
+         Return EgtMsg(MSG_DRAWPANEL + 40)
       End Get
    End Property
    Public ReadOnly Property ScaleToolTip As String
       Get
-         Return EgtMsg(5241)     ' Scala
+         Return EgtMsg(MSG_DRAWPANEL + 41)
       End Get
    End Property
    Public ReadOnly Property Scale3DToolTip As String
       Get
-         Return EgtMsg(5242)     ' Scala 3D
+         Return EgtMsg(MSG_DRAWPANEL + 42)
       End Get
    End Property
 
@@ -425,6 +436,7 @@ Public Class DrawPanelVM
       OnPropertyChanged(NameOf(DrawPanel_Visibility))
    End Sub
 
+
 #Region "Button state"
 
    Private m_bLayerOk As Boolean
@@ -434,7 +446,7 @@ Public Class DrawPanelVM
       End Get
       Set(value As Boolean)
          m_bLayerOk = value
-         OnPropertyChanged(NameOf(bLayerOk))
+         OnPropertyChanged("bLayerOk")
       End Set
    End Property
    Private m_bSelOk As Boolean
@@ -444,7 +456,7 @@ Public Class DrawPanelVM
       End Get
       Set(value As Boolean)
          m_bSelOk = value
-         OnPropertyChanged(NameOf(bSelOk))
+         OnPropertyChanged("bSelOk")
       End Set
    End Property
    Private m_bLayerOkAndSelOk As Boolean
@@ -454,7 +466,7 @@ Public Class DrawPanelVM
       End Get
       Set(value As Boolean)
          m_bLayerOkAndSelOk = value
-         OnPropertyChanged(NameOf(bLayerOkAndSelOk))
+         OnPropertyChanged("bLayerOkAndSelOk")
       End Set
    End Property
 
@@ -469,7 +481,9 @@ Public Class DrawPanelVM
    Private m_cmdCircle3P As ICommand
    Private m_cmdArcCSE As ICommand
    Private m_cmdArc3P As ICommand
+   Private m_cmdArc2PR As ICommand
    Private m_cmdArcPDP As ICommand
+   Private m_cmdBiArc As ICommand
    Private m_cmdRectangle2P As ICommand
    Private m_cmdPolygon As ICommand
    Private m_cmdPolygonSide As ICommand
@@ -747,6 +761,29 @@ Public Class DrawPanelVM
 
 #End Region ' Arc3PCommand
 
+#Region "Arc2PRCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Arc2PR.
+   ''' </summary>
+   Public ReadOnly Property Arc2PRCommand As ICommand
+      Get
+         If m_cmdArc2PR Is Nothing Then
+            m_cmdArc2PR = New RelayCommand(AddressOf Arc2PR)
+         End If
+         Return m_cmdArc2PR
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Arc2PR.  This method is invoked by the Arc2PRCommand.
+   ''' </summary>
+   Public Sub Arc2PR(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC2PR)
+   End Sub
+
+#End Region ' Arc2PRCommand
+
 #Region "ArcPDPCommand"
 
    ''' <summary>
@@ -777,6 +814,33 @@ Public Class DrawPanelVM
 
 #End Region ' ArcPDPCommand
 
+#Region "BiArcCommand"
+
+   ''' <summary>
+   ''' Returns a command that do BiArc.
+   ''' </summary>
+   Public ReadOnly Property BiArcCommand As ICommand
+      Get
+         If m_cmdBiArc Is Nothing Then
+            m_cmdBiArc = New RelayCommand(AddressOf BiArc)
+         End If
+         Return m_cmdBiArc
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the BiArc.  This method is invoked by the BiArcCommand.
+   ''' </summary>
+   Public Sub BiArc(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.BIARC)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CURVEBEZIER)
+      End If
+   End Sub
+
+#End Region ' BiArcCommand
+
 #Region "Rectangle2PCommand"
 
    ''' <summary>
@@ -1466,6 +1530,8 @@ Public Class DrawPanelVM
    Public Sub SolidIntersectSurf(ByVal param As Object)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CUTSURFSURF)
+      ElseIf (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.TRIMSURFTMWITHCURVE)
       Else
          Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SOLIDINTERSECTSURF)
       End If
@@ -2155,6 +2221,7 @@ Public Class DrawPanelVM
          If Not IniFile.m_ProjectSceneContext = 0 Then
             bSelOk = EgtGetFirstSelectedObj() <> GDB_ID.NULL
             bLayerOkAndSelOk = m_bLayerOk And m_bSelOk
+            Map.refStatusBarVM.UpdateSelectedCount()
          End If
 
          If Application.m_UpdateLayerTree Then

EgtCAM5.vbproj

@@ -161,18 +161,13 @@
       <DependentUpon>CurrSetUpV.xaml</DependentUpon>
     </Compile>
     <Compile Include="CurrSetUp\CurrSetUpVM.vb" />
-    <Compile Include="EgtColorPicker\EgtColorPickerV.xaml.vb">
-      <DependentUpon>EgtColorPickerV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EgtManageFileDialog\EgtManageFileDialogV.xaml.vb">
-      <DependentUpon>EgtManageFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EgtMessageBox\EgtMessageBoxV.xaml.vb">
-      <DependentUpon>EgtMessageBoxV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="DataGridMultiselectManaging\IListItemConverter.vb" />
     <Compile Include="DataGridMultiselectManaging\MultiSelectorBehaviours.vb" />
     <Compile Include="DataGridMultiselectManaging\TwoListSynchronizer.vb" />
+    <Compile Include="ExecuteWindow\ExecuteWindowV.xaml.vb">
+      <DependentUpon>ExecuteWindowV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ExecuteWindow\ExecuteWindowVM.vb" />
     <Compile Include="LeftTray\LeftTrayV.xaml.vb">
       <DependentUpon>LeftTrayV.xaml</DependentUpon>
     </Compile>
@@ -182,6 +177,9 @@
       <DependentUpon>EstimationsExpanderV.xaml</DependentUpon>
     </Compile>
     <Compile Include="OptionPanel\MachiningOptionPanel\EstimationsExpander\EstimationsExpander.vb" />
+    <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\ProbingParameterExpanderV.xaml.vb">
+      <DependentUpon>ProbingParameterExpanderV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\FiveAxisMachinigParameterExpanderV.xaml.vb">
       <DependentUpon>FiveAxisMachinigParameterExpanderV.xaml</DependentUpon>
     </Compile>
@@ -295,8 +293,20 @@
     <Compile Include="Special-BeamWall\WallPanelV.xaml.vb">
       <DependentUpon>WallPanelV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Special-BeamWall\WallPanelVM.vb" />
     <Compile Include="Special-BeamWall\Wall.vb" />
+    <Compile Include="Special-BeamWall\WallPanelVM.vb" />
+    <Compile Include="Special-ReversePost\ReversePostPanelV.xaml.vb">
+      <DependentUpon>ReversePostPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Special-ReversePost\ReversePostPanelVM.vb" />
+    <Compile Include="Special-Trimming\TrimmingPanelV.xaml.vb">
+      <DependentUpon>TrimmingPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Special-Trimming\TrimmingPanelVM.vb" />
+    <Compile Include="Special-Window\WindowPanelV.xaml.vb">
+      <DependentUpon>WindowPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Special-Window\WindowPanelVM.vb" />
     <Compile Include="SpecialPanel\SpecialPanelV.xaml.vb">
       <DependentUpon>SpecialPanelV.xaml</DependentUpon>
     </Compile>
@@ -312,6 +322,7 @@
     <Compile Include="Utility\Analyze.vb" />
     <Compile Include="Utility\BasePanelVM.vb" />
     <Compile Include="Utility\BindingProxy.vb" />
+    <Compile Include="Utility\DynamicGridModule.vb" />
     <Compile Include="Utility\Map.vb" />
     <Compile Include="Internals\MruList.vb" />
     <Compile Include="Utility\MachineModel.vb" />
@@ -437,6 +448,7 @@
       <DependentUpon>GunStockWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="Special-GunStock\GunStockWndVM.vb" />
+    <Compile Include="Utility\TMDbParamVisibility.vb" />
     <Compile Include="StructureDataForMessenger.vb" />
     <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionUtility.vb" />
     <Compile Include="ToolsDbWindow\ToolsUpdate.vb" />
@@ -467,22 +479,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="EgtColorPicker\EgtColorPickerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="EgtManageFileDialog\EgtManageFileDialogV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="EgtMessageBox\EgtMessageBoxV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="EstimationsDetailsWnd\EstimationsDetailsWndV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ExecuteWindow\ExecuteWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="LeftTray\LeftTrayV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -495,6 +499,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\ProbingParameterExpanderV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\FiveAxisMachinigParameterExpanderV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -647,6 +655,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Special-ReversePost\ReversePostPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Special-Trimming\TrimmingPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Special-Window\WindowPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SpecialPanel\SpecialPanelV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1059,43 +1079,22 @@
     <Resource Include="Resources\DrawPanel\StmMoveVertex.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Error.png" />
+    <Resource Include="Resources\DrawPanel\Arc2PR.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Information.png" />
+    <Resource Include="Resources\DrawPanel\BiArc.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Question.png" />
+    <Resource Include="Resources\ExecuteWindow\reload.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Warning.png" />
+    <Resource Include="Resources\ToolPreview\Head.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\EgtDialog\Folder.png" />
+    <Resource Include="Resources\ToolPreview\Tool.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\EgtDialog\New.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtDialog\Restore.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtDialog\Root.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Asterisk.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Exclamation.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgtMessageBox\Hand.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\AboutBox\EgalwareLogo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Egalware.ico" />
+    <Resource Include="Resources\ToolPreview\Delete.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>

EgtColorPicker/EgtColorPickerV.xaml

@@ -1,266 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtColorPickerV"
-                            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"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Width="750" Height="450"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-   
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid Margin="5,5,5,0">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <TabControl>
-               <TabItem Header="{Binding BasicColor_Msg}">
-                  <Grid HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <ListBox ItemsSource="{Binding BasicColors}"
-                              SelectedItem="{Binding SelColor}"
-                              HorizontalAlignment="Center"
-                              BorderThickness="0">
-                        <ListBox.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <UniformGrid Columns="13"/>
-                           </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Rectangle Width="20"
-                                      Height="20"
-                                      Margin="2"
-                                      Stroke="Black" 
-                                      StrokeThickness="0.5"
-                                      Fill="{Binding Fill}"/>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemContainerStyle>
-                           <Style TargetType="ListBoxItem">
-                              <Setter Property="Margin" Value="0"/>
-                              <Setter Property="Padding" Value="0"/>
-                           </Style>
-                        </ListBox.ItemContainerStyle>
-                     </ListBox>
-                  </Grid>
-               </TabItem>
-               <TabItem Header="{Binding ColorPicker_Msg}">
-                  <TabItem.Resources>
-                     <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
-                        <Setter Property="BorderThickness" Value="1.5"/>
-                        <Setter Property="BorderBrush" Value="White"/>
-                     </Style>
-                  </TabItem.Resources>
-                  <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
-                                         SelectedItem="{Binding sHexSelColor}"
-                                         Orientation="Vertical" 
-                                         Margin="2.5"
-                                         RowCount="13" 
-                                         ColumnCount="13"
-                                         Height="300"
-                                         Width="350"
-                                         Style="{StaticResource EgtHexList}">
-                     <EgtWPFLib5:EgtHexList.ItemTemplate>
-                        <DataTemplate/>
-                     </EgtWPFLib5:EgtHexList.ItemTemplate>
-                     <EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                        <Style TargetType="EgtWPFLib5:EgtHexItem" BasedOn="{StaticResource EgtHexItem}">
-                           <Setter Property="Grid.Row" Value="{Binding nRow}"/>
-                           <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
-                           <Setter Property="Background" Value="{Binding Background}"/>
-                        </Style>
-                     </EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                  </EgtWPFLib5:EgtHexList>
-               </TabItem>
-               <TabItem Header="{Binding ColorPickerTheme_Msg}">
-                  <Grid HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <ListBox ItemsSource="{Binding BasicColorsTheme}"
-                              SelectedItem="{Binding SelColorTheme}"
-                              BorderThickness="0">
-                        <ListBox.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <UniformGrid Columns="13"/>
-                           </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Rectangle Width="20"
-                                         Height="20"
-                                         Margin="2"
-                                         Stroke="Black" 
-                                         StrokeThickness="0.5"
-                                         Fill="{Binding Fill}"/>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemContainerStyle>
-                           <Style TargetType="ListBoxItem">
-                              <Setter Property="Margin" Value="0"/>
-                              <Setter Property="Padding" Value="0"/>
-                           </Style>
-                        </ListBox.ItemContainerStyle>
-                     </ListBox>
-                  </Grid>
-               </TabItem>
-            </TabControl>
-         </Grid>
-         <Grid Grid.Column="1"
-               Margin="5,0,0,0">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <TextBlock Text="{Binding CustomColor_Msg}"
-                       Margin="5,18,5,10"
-                       Style="{StaticResource DialogWindow_TextBlock}"/>
-            <Grid Grid.Row="1">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <ListBox ItemsSource="{Binding CustomColors}"
-                        SelectedItem="{Binding SelCustomColor}"
-                        HorizontalAlignment="Center"
-                        BorderThickness="0">
-                  <ListBox.ItemsPanel>
-                     <ItemsPanelTemplate>
-                        <UniformGrid Columns="13"/>
-                     </ItemsPanelTemplate>
-                  </ListBox.ItemsPanel>
-                  <ListBox.ItemTemplate>
-                     <DataTemplate>
-                        <Rectangle Width="20"
-                                   Height="20"
-                                   Margin="2"
-                                   Stroke="Black" 
-                                   StrokeThickness="0.5"
-                                   Fill="{Binding Fill}"/>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-                  <ListBox.ItemContainerStyle>
-                     <Style TargetType="ListBoxItem">
-                        <Setter Property="Margin" Value="0"/>
-                        <Setter Property="Padding" Value="0"/>
-                     </Style>
-                  </ListBox.ItemContainerStyle>
-               </ListBox>
-            </Grid>
-            <Grid Grid.Row="2"
-                  Margin="0,20,0,0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid Margin="0,10,5,0"
-                     HorizontalAlignment="Left">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*" />
-                     <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  <Rectangle Width="100" 
-                             Height="70" 
-                             Stroke="Black" 
-                             StrokeThickness="0.5"
-                             Fill="{Binding CurrColor}"/>
-                  <Button x:Name="SaveColor"
-                          Grid.Row="1"
-                          Margin="0,10,0,0"
-                          Content="{Binding AddCColor_Msg}"
-                          Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource LeftPanel_TextButton}"/>
-               </Grid>
-               <Grid Grid.Column="1">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="1*"/>
-                     <ColumnDefinition Width="1*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <TextBlock Text="{Binding Red_Msg}"
-                             Margin="0,10,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <TextBox Grid.Column="1" 
-                           HorizontalAlignment="Right"
-                           Margin="0,10,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-                  <TextBlock Grid.Row="1"
-                             Text="{Binding Green_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <TextBox Grid.Column="1"
-                           Grid.Row="1"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-                  <TextBlock Grid.Row="2"
-                             Text="{Binding Blu_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <TextBox Grid.Column="1"
-                           Grid.Row="2"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-                  <TextBlock Grid.Row="3"
-                             Text="{Binding Hexadecimal_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <TextBox Grid.Column="1"
-                           Grid.Row="3"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           Text="{Binding Hexadecimal}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               </Grid>
-            </Grid>
-         </Grid>
-      </Grid>
-      <UniformGrid Grid.Row="2"  
-                   Rows="1"
-                   Margin="10,10,10,0">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtColorPicker/EgtColorPickerV.xaml.vb

@@ -1,68 +0,0 @@
-Imports System.Windows.Forms
-Imports EgtWPFLib5
-
-Public Class EgtColorPickerV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtColorPickerVM As EgtColorPickerVM
-
-   Private Shadows DialogResult As DialogResult
-
-   Public Property CustomColors As Integer()
-      Get
-         Return m_EgtColorPickerVM.GetCustomColors()
-      End Get
-      Set(value As Integer())
-         m_EgtColorPickerVM.SetCustomColors(value)
-      End Set
-   End Property
-
-   Public Property Color As System.Drawing.Color
-      Get
-         Return System.Drawing.Color.FromArgb(255, CInt(m_EgtColorPickerVM.Red), CInt(m_EgtColorPickerVM.Green), CInt(m_EgtColorPickerVM.Blue))
-      End Get
-      Set(value As System.Drawing.Color)
-         m_EgtColorPickerVM.Red = CStr(value.R)
-         m_EgtColorPickerVM.Green = CStr(value.G)
-         m_EgtColorPickerVM.Blue = CStr(value.B)
-      End Set
-   End Property
-
-#End Region    ' Fields & Properties
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EtgColorPickerVM As EgtColorPickerVM)
-      MyBase.New(Owner)
-      InitializeComponent()
-      Me.DataContext = EtgColorPickerVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtColorPickerVM = EtgColorPickerVM
-   End Sub
-
-#End Region    ' Constructors
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtColorPickerVM.m_CloseWindow
-      Me.DialogResult = CType(DialogResult, DialogResult)
-      Me.Close()
-   End Sub
-
-#End Region     ' Events
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Apre una finestra EgtColorPicker
-   ''' </summary>
-   ''' <returns></returns>
-   Public Overloads Function ShowDialog() As DialogResult
-      MyBase.ShowDialog()
-      Return Me.DialogResult
-   End Function
-
-#End Region    ' Methods
-
-End Class

EgtManageFileDialog/EgtManageFileDialogV.xaml

@@ -1,400 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtManageFileDialogV"
-                            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"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Height="500" Width="800"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Button Command="{Binding GoBack_Command}"
-                 Style="{StaticResource RightPanel_Button}">
-            <Image Source="\Resources\EgtDialog\Restore.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <TextBlock Grid.Column="1"
-                    Margin="5"
-                    Text="{Binding sSelPath}"
-                    HorizontalAlignment="Left"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-         <ComboBox Grid.Column="2"
-                   HorizontalAlignment="Right"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding ViewModeList}"
-                   SelectedItem="{Binding SelViewMode}"
-                   Margin="2.5,5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
-      </Grid>
-      <Grid Grid.Row="1"
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         <TreeView x:Name="FileTree" 
-                   ItemsSource="{Binding RootList}"                   
-                   Margin="10"
-                   FontSize="15"
-                   BorderBrush="White">
-            <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
-                                         ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            Style="{StaticResource Button_Image}"/>
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
-                  </StackPanel>
-               </HierarchicalDataTemplate>
-               <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            Style="{StaticResource Button_Image}"/>
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
-                  </StackPanel>
-               </DataTemplate>
-            </TreeView.Resources>
-            <TreeView.ItemContainerStyle>
-               <Style TargetType="{x:Type TreeViewItem}">
-                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
-               </Style>
-            </TreeView.ItemContainerStyle>
-         </TreeView>
-         <TabControl Grid.Column="1"
-                     Background="Transparent"
-                     BorderBrush="White"
-                     BorderThickness="0"
-                     SelectedIndex="{Binding nSelTab}">
-            <TabControl.ItemContainerStyle>
-               <Style TargetType="{x:Type TabItem}">
-                  <Setter Property="Visibility" Value="Collapsed"/>
-               </Style>
-            </TabControl.ItemContainerStyle>
-            <TabItem Header="LISTBOX">
-               <ListBox x:Name="FileList" 
-                        Grid.Row="1"
-                        Margin="5,5,5,5"
-                        BorderBrush="White"
-                        IsSynchronizedWithCurrentItem="True"
-                        ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                        SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
-                  <ListBox.Resources>
-                     <DataTemplate x:Key="ListTemplateView" 
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="20">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Height="15"
-                                  Style="{StaticResource Button_Image}"/>
-                           <TextBlock Grid.Column="1"
-                                      Text="{Binding sName}"
-                                      Style="{StaticResource DialogWindow_TextBlock}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="TilesTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50"
-                              Width="250">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="1*"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Style="{StaticResource Button_Image}"/>
-                           <UniformGrid Grid.Column="1"
-                                        Rows="3"
-                                        Margin="2.5,0,2.5,5">
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sName}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding ghTypeItem}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sDimension}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                           </UniformGrid>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="ContentTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50">
-                           <Grid.RowDefinitions>
-                              <RowDefinition Height="1*"/>
-                              <RowDefinition Height="Auto"/>
-                           </Grid.RowDefinitions>
-                           <Grid>
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                                 <ColumnDefinition Width="1*"/>
-                              </Grid.ColumnDefinitions>
-                              <Image Source="{Binding sIconSource}"
-                                     Style="{StaticResource Button_Image}"/>
-                              <UniformGrid Grid.Column="1"
-                                           Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sName}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </UniformGrid>
-                              <UniformGrid Grid.Column="2"
-                                           Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sLastModifyDate}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sDimension}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </UniformGrid>
-                           </Grid>
-                           <Border Grid.Row="1"
-                                   BorderThickness="1"
-                                   BorderBrush="LightGray"/>
-                        </Grid>
-                     </DataTemplate>
-                  </ListBox.Resources>
-                  <ListBox.ItemTemplate>
-                     <DataTemplate DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <ContentControl Content="{Binding}">
-                           <ContentControl.Style>
-                              <Style TargetType="{x:Type ContentControl}">
-                                 <Style.Triggers>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="0">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="2">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
-                                    </DataTrigger>
-                                 </Style.Triggers>
-                              </Style>
-                           </ContentControl.Style>
-                        </ContentControl>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-                  <ListBox.ItemContainerStyle>
-                     <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                        <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick"/>
-                     </Style>
-                  </ListBox.ItemContainerStyle>
-                  <ListBox.Style>
-                     <Style TargetType="{x:Type ListBox}">
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="0">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Vertical"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="1">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Horizontal"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="2">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <StackPanel Orientation="Vertical"
-                                                   HorizontalAlignment="Stretch"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                        </Style.Triggers>
-                     </Style>
-                  </ListBox.Style>
-               </ListBox>
-            </TabItem>
-            <TabItem Header="DATAGRID">
-               <DataGrid AutoGenerateColumns="False"
-                         IsReadOnly="True"
-                         HeadersVisibility="Column"
-                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                         SelectedItem="{Binding ItemSelected}">
-                  <!--   ColumnHeaderStyle="{StaticResource DataGridColumnHeader}"
-                         RowStyle="{StaticResource RowDataGrid_CustomHighLight}"-->
-                  <DataGrid.Columns>
-                     <DataGridTemplateColumn Width="5*">
-                        <DataGridTemplateColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.HeaderTemplate>
-                        <DataGridTemplateColumn.CellTemplate>
-                           <DataTemplate>
-                              <Grid>
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                 </Grid.ColumnDefinitions>
-                                 <Image Source="{Binding sIconSource}"
-                                        Margin="2.5,0,2.5,0"
-                                        Style="{StaticResource Button_Image}"/>
-                                 <TextBlock Grid.Column="1"
-                                            Text="{Binding sName}"
-                                            VerticalAlignment="Center"
-                                            Margin="2.5,0,0,0"/>
-                              </Grid>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                     </DataGridTemplateColumn>
-                     <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Right"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Right"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                  </DataGrid.Columns>
-                  <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-                  </DataGrid.InputBindings>
-               </DataGrid>
-            </TabItem>
-         </TabControl>
-      </Grid>
-      <Grid Grid.Row="2" 
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Margin="5,5,5,5"
-                    Text="{Binding FileName_Msg}"
-                    HorizontalAlignment="Right"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-         <TextBox Grid.Column="1"
-                  Margin="2.5,2.5,2.5,5"
-                  TextAlignment="Left"
-                  HorizontalAlignment="Stretch"
-                  Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource ParameterList_TextBox}"/>
-         <ComboBox Grid.Column="2"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding FilterList}"
-                   SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
-                   DisplayMemberPath="sNameExstension"
-                   HorizontalAlignment="Right"
-                   Margin="10,2.5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
-      </Grid>
-      <UniformGrid Grid.Row="3"  
-                   Rows="1"
-                   Margin="2.5,0,2.5,0">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 HorizontalAlignment="Right"
-                 Margin="15,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 HorizontalAlignment="Left"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtManageFileDialog/EgtManageFileDialogV.xaml.vb

@@ -1,141 +0,0 @@
-Imports System.Windows.Forms
-Imports EgtWPFLib5
-
-Public Class EgtManageFileDialogV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM
-
-   Private Shadows DialogResult As DialogResult
-
-   ''' <summary>
-   ''' Stringa che specifica il titolo da mostrare
-   ''' </summary>
-   Public Overloads Property Title As String
-      Get
-         Return m_EgtManageFileDialogVM.sTitle
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sTitle = value
-      End Set
-   End Property
-
-   Public Property Filter As String
-      Get
-         Return m_EgtManageFileDialogVM.sFilter
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sFilter = value
-      End Set
-   End Property
-
-   Public Property InitialDirectory As String
-      Get
-         Return m_EgtManageFileDialogVM.sInitialDirectory
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sInitialDirectory = value
-      End Set
-   End Property
-
-   Public Property SafeFileName As String
-      Get
-         Return m_EgtManageFileDialogVM.sSaveFileName
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sSaveFileName = value
-      End Set
-   End Property
-
-   Public Property FileName As String
-      Get
-         Return m_EgtManageFileDialogVM.sFileName
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sFileName = value
-      End Set
-   End Property
-
-   Public Property FilterIndex As Integer
-      Get
-         Return m_EgtManageFileDialogVM.nFilterIndex
-      End Get
-      Set(value As Integer)
-         m_EgtManageFileDialogVM.nFilterIndex = value
-      End Set
-   End Property
-
-   Public Property Mode As Integer
-      Get
-         Return m_EgtManageFileDialogVM.nMode
-      End Get
-      Set(value As Integer)
-         m_EgtManageFileDialogVM.nMode = value
-      End Set
-   End Property
-
-   Public Property CheckFileExists As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bCheckFileExists
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bCheckFileExists = value
-      End Set
-   End Property
-
-   Public Property ValidateNames As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bValidateNames
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bValidateNames = value
-      End Set
-   End Property
-
-   Public Property OverwritePrompt As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bOverwritePrompt
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bOverwritePrompt = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
-      MyBase.New(Owner)
-      InitializeComponent()
-      Me.DataContext = EgtManageFileDialogVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtManageFileDialogVM = EgtManageFileDialogVM
-   End Sub
-
-#End Region
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region
-
-#Region "METHODS"
-
-   Public Overloads Function ShowDialog() As DialogResult
-      MyBase.ShowDialog()
-      Return Me.DialogResult
-   End Function
-
-   Private Sub ListBoxItem_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
-      m_EgtManageFileDialogVM.MouseDoubleClick()
-   End Sub
-
-#End Region    '  METHODS
-
-End Class

EgtMessageBox/EgtMessageBoxV.xaml

@@ -1,49 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtMessageBoxV"
-                            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"
-                            Title="{Binding sTitle}"
-                            SizeToContent="WidthAndHeight"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-   
-   <Grid Margin="2.5,2.5,2.5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="20,20,20,20">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"
-                Margin="0,0,0,0"/>
-         <TextBlock Grid.Column="1"
-                    Text="{Binding sMessage}"
-                    Margin="5,0,5,0"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-      </Grid>
-      <ItemsControl Grid.Row="1"
-                    ItemsSource="{Binding ButtonList}"
-                    HorizontalAlignment="Center">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <UniformGrid Rows="1"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <Button IsDefault="{Binding bIsDefault}"
-                       Content="{Binding sMessage}"
-                       Command="{Binding Command_Command}"
-                       Margin="2.5,0,2.5,0"
-                       Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-
-      </ItemsControl>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtMessageBox/EgtMessageBoxV.xaml.vb

@@ -1,109 +0,0 @@
-Imports EgtWPFLib5
-
-Public Class EgtMessageBoxV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtMessageBoxVM As EgtMessageBoxVM
-
-   Private Shadows DialogResult As MessageBoxResult
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
-      MyBase.New(Owner)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = EgtMessageBoxVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtMessageBoxVM = EgtMessageBoxVM
-   End Sub
-
-#End Region
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
-   ''' <param name="DefaultResult">Valore che specifica il bottone di default</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon, DefaultResult))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-#End Region    ' METHODS
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region
-
-End Class

EstimationsDetailsWnd/EstimationsDetailsWndV.xaml

@@ -1,14 +1,14 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="EstimationsDetailsWndV"
-                            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"
-                            Title="{Binding TitleMsg}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
-                            Width="300" Height="300"
-                            IsResizable="True"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
-
+   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"
+   Title="{Binding TitleMsg}"
+   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
+   Width="300" Height="300"
+   IsResizable="True"
+   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
+   
    <WebBrowser Name="EstimationsWebBrowser" Margin="10"/>
-
+   
 </EgtWPFLib5:EgtCustomWindow>

EstimationsDetailsWnd/EstimationsDetailsWndVM.vb

@@ -16,12 +16,16 @@ Public Class EstimationsDetailsWndVM
 
    Public ReadOnly Property TitleMsg As String
       Get
-         Return EgtMsg(5344)       ' Estimation details
+         Return EgtMsg(MSG_SIMULATION + 44)       ' Estimation details
       End Get
    End Property
 
 #End Region    ' Messages
 
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+
 #End Region    'FIELDS & PROPERTIES
 
 #Region "CONSTRUCTOR"
@@ -32,4 +36,8 @@ Public Class EstimationsDetailsWndVM
 
 #End Region    ' CONSTRUCTOR
 
+#Region "METHODS"
+
+#End Region    ' METHODS
+
 End Class

ExecutePanel/ExecutePanelVM.vb

@@ -32,7 +32,7 @@ Public Class ExecutePanelVM
 
    Public ReadOnly Property ExecToolTip As String
       Get
-         Return EgtMsg(5108)     ' Esegui Script<br/>Esegui Script recenti (Tasto Destro)
+         Return EgtMsg(MSG_TOPCOMMANDBAR + 8)
       End Get
    End Property
 
@@ -65,8 +65,13 @@ Public Class ExecutePanelVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Sub Exec(ByVal param As Object)
-      Map.refProjectVM.PreExecScript(True)
-      Map.refProjectVM.ExecScript(String.Empty)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Dim ExecuteWindow As New ExecuteWindowV(Application.Current.MainWindow, New ExecuteWindowVM)
+         ExecuteWindow.ShowDialog()
+      Else
+         Map.refProjectVM.PreExecScript(True)
+         Map.refProjectVM.ExecScript(String.Empty)
+      End If
    End Sub
 
 #End Region    ' ExecCommand

ExecuteWindow/ExecuteWindowV.xaml

@@ -0,0 +1,39 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="ExecuteWindowV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="Execute Window" 
+                            Height="500" Width="400"
+                            IsResizable="True"
+                            IsMinimizable="False" 
+                            WindowStartupLocation="CenterOwner" 
+                            ShowInTaskbar="False"
+                            TitleBarHeight="32"
+                            PreviewKeyDown="EgtCustomWindow_PreviewKeyDown"
+                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="Auto"/>
+      </Grid.ColumnDefinitions>
+      <TextBox Text="{Binding sScriptText}"
+               Style="{StaticResource ExecuteWindow_TextBox}"/>
+      <Button Grid.Row="1" 
+              Grid.ColumnSpan="2"
+              Content="{Binding OkMsg}"
+              Command="{Binding Ok_Command}"
+              Style="{StaticResource EgtCAM5_InputButton}"/>
+      <Button Grid.Column="1"
+              Command="{Binding Reload_Command}"
+              IsEnabled="{Binding bReload_IsEnable}"
+              Style="{StaticResource ExecuteWindow_Button}">
+         <Image Source="/Resources/ExecuteWindow/reload.png" Stretch="Uniform"/>
+      </Button>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

ExecuteWindow/ExecuteWindowV.xaml.vb

@@ -0,0 +1,32 @@
+Public Class ExecuteWindowV
+
+#Region "FIELDS & PROPERTIES"
+
+   Private WithEvents m_ExecuteWindowVM As ExecuteWindowVM
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New(Owner As Window, ExecuteWindowVM As ExecuteWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = ExecuteWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_ExecuteWindowVM = ExecuteWindowVM
+   End Sub
+
+#End Region    ' Constructor
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ExecuteWindowVM.OnCloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+   Private Sub EgtCustomWindow_PreviewKeyDown(sender As Object, e As KeyEventArgs)
+      If e.Key = Key.Escape Then
+         Me.Close()
+      End If
+   End Sub
+
+End Class

ExecuteWindow/ExecuteWindowVM.vb

@@ -0,0 +1,130 @@
+Imports System.Text
+Imports EgtUILib
+Imports System.IO
+
+Public Class ExecuteWindowVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   ' Evento per chiusura finestra
+   Friend Event OnCloseWindow(bDialogResult As Boolean)
+
+   Private ReadOnly sScriptFilePath As String = Path.Combine(IniFile.m_sTempDir, "ImmExec" & IniFile.m_nInstance.ToString() & ".lua")
+
+   Private m_sScriptText As String
+   Public Property sScriptText As String
+      Get
+         Return m_sScriptText
+      End Get
+      Set(value As String)
+         m_sScriptText = value
+         NotifyPropertyChanged(NameOf(sScriptText))
+      End Set
+   End Property
+   Private Sub SetScriptFile(value As String)
+      m_sScriptText = value
+      NotifyPropertyChanged(NameOf(sScriptText))
+   End Sub
+
+   Private m_bReload_IsEnable As Boolean = File.Exists(sScriptFilePath)
+   Public ReadOnly Property bReload_IsEnable As Boolean
+      Get
+         Return m_bReload_IsEnable
+      End Get
+   End Property
+
+#Region "Messages"
+
+   Public ReadOnly Property OkMsg As String
+      Get
+         Return EgtMsg(20041)
+      End Get
+   End Property
+
+   Public ReadOnly Property SaveMsg As String
+      Get
+         Return EgtMsg(6453)
+      End Get
+   End Property
+
+#End Region    ' Messages
+
+   ' Definizione Comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdReload As ICommand
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+   End Sub
+
+#End Region    ' Constructor
+
+#Region "METHODS"
+
+   Private Sub SaveScript(sPathFileScript As String, sScriptText As String)
+      If String.IsNullOrWhiteSpace(sPathFileScript) OrElse String.IsNullOrWhiteSpace(sScriptText) Then Return
+      File.WriteAllText(sPathFileScript, sScriptText, Encoding.UTF8)
+   End Sub
+
+   Private Function ReadScript(sPathFileScript As String) As String
+      If String.IsNullOrWhiteSpace(sPathFileScript) Then Return String.Empty
+      Return File.ReadAllText(sPathFileScript)
+   End Function
+
+#End Region    ' Methods
+
+#Region "COMMANDS"
+
+#Region "Ok_Command"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      ' Verifico ci sia del testo
+      If String.IsNullOrWhiteSpace(m_sScriptText) Then Return
+      ' Salva il file script
+      SaveScript(sScriptFilePath, m_sScriptText)
+      ' Esegue il file script
+      Map.refProjectVM.PreExecScript(False)
+      Map.refProjectVM.ExecScript(sScriptFilePath)
+      ' Se non passato a lavorazione, aggiornamento visualizzazione
+      If IniFile.m_ProjectMode <> ProjectModeOpt.MACHINING Then EgtDraw()
+      ' Chiudo finestra
+      RaiseEvent OnCloseWindow(True)
+   End Sub
+
+#End Region    ' Ok_Command
+
+#Region "Reload_Command"
+
+   Public ReadOnly Property Reload_Command As ICommand
+      Get
+         If m_cmdReload Is Nothing Then
+            m_cmdReload = New Command(AddressOf Reload)
+         End If
+         Return m_cmdReload
+      End Get
+   End Property
+
+   Public Sub Reload()
+      If File.Exists(sScriptFilePath) Then
+         SetScriptFile(ReadScript(sScriptFilePath))
+      End If
+   End Sub
+
+#End Region    ' Reload_Command
+
+#End Region    ' Commands
+
+End Class

GridPanel/GridPanelV.xaml

@@ -1,6 +1,6 @@
 <UserControl x:Class="GridPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button Command="{Binding CPlaneTopCommand}" ToolTip="{Binding CPlaneTopToolTip}" Style="{StaticResource GridViewPanelButton}">

GridPanel/GridPanelVM.vb

@@ -19,42 +19,42 @@ Public Class GridPanelVM
 
    Public ReadOnly Property CPlaneTopToolTip As String
       Get
-         Return EgtMsg(5269)     ' Griglia da Sopra
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 19)
       End Get
    End Property
    Public ReadOnly Property CPlaneFrontToolTip As String
       Get
-         Return EgtMsg(5270)     ' Griglia di Fronte
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 20)
       End Get
    End Property
    Public ReadOnly Property CPlaneRightToolTip As String
       Get
-         Return EgtMsg(5271)     ' Griglia da Destra
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 21)
       End Get
    End Property
    Public ReadOnly Property CPlaneBackToolTip As String
       Get
-         Return EgtMsg(5272)     ' Griglia da Dietro
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 22)
       End Get
    End Property
    Public ReadOnly Property CPlaneLeftToolTip As String
       Get
-         Return EgtMsg(5273)     ' Griglia da Sinistra
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 23)
       End Get
    End Property
    Public ReadOnly Property CPlaneBottomToolTip As String
       Get
-         Return EgtMsg(5274)     ' Griglia da Sotto
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 24)
       End Get
    End Property
    Public ReadOnly Property CPlaneElevationToolTip As String
       Get
-         Return EgtMsg(5276)     ' Elevazione Griglia
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 26)
       End Get
    End Property
    Public ReadOnly Property CPlaneOriginToolTip As String
       Get
-         Return EgtMsg(5277)     ' Origine Griglia
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 27)
       End Get
    End Property
 

InstrumentPanel/InstrumentPanelV.xaml

@@ -1,15 +1,17 @@
 <EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
-                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-                              IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False"
-                              TitleBarOrientation="Horizontal">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+   IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False"
+   TitleBarOrientation="Horizontal">
 
-   <ToggleButton ToolTip="{Binding AnalyzeToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding AnalyzeIsChecked}" IsEnabled="{Binding AnalyzeIsEnabled}">
-      <Image Source="/Resources/GridViewPanel/Analyze.png" Stretch="Uniform"/>
-   </ToggleButton>
-   <ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding GetDistIsChecked}">
-      <Image Source="/Resources/GridViewPanel/GetDist.png" Stretch="Uniform"/>
-   </ToggleButton>
+   <!--<StackPanel Background="Transparent" Orientation="Horizontal">-->
+      <ToggleButton ToolTip="{Binding AnalyzeToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding AnalyzeIsChecked}" IsEnabled="{Binding AnalyzeIsEnabled}">
+         <Image Source="/Resources/GridViewPanel/Analyze.png" Stretch="Uniform"/>
+      </ToggleButton>
+      <ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding GetDistIsChecked}">
+         <Image Source="/Resources/GridViewPanel/GetDist.png" Stretch="Uniform"/>
+      </ToggleButton>
+   <!--</StackPanel>-->
 
 </EgtFloating:EgtFloatingPanel>

InstrumentPanel/InstrumentPanelVM.vb

@@ -9,12 +9,12 @@ Public Class InstrumentPanelVM
 
    Public ReadOnly Property AnalyzeToolTip As String
       Get
-         Return EgtMsg(5267)     ' Analizza
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 17)
       End Get
    End Property
    Public ReadOnly Property GetDistToolTip As String
       Get
-         Return EgtMsg(5268)     ' Distanza
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 18)
       End Get
    End Property
 
@@ -37,7 +37,7 @@ Public Class InstrumentPanelVM
                Analyze.EraseAnalyzeGroup()
                EgtDraw()
             End If
-            OnPropertyChanged(NameOf(AnalyzeIsChecked))
+            OnPropertyChanged("AnalyzeIsChecked")
          End If
       End Set
    End Property
@@ -50,7 +50,7 @@ Public Class InstrumentPanelVM
       Set(value As Boolean)
          If value <> m_AnalyzeIsEnabled Then
             m_AnalyzeIsEnabled = value
-            OnPropertyChanged(NameOf(AnalyzeIsEnabled))
+            OnPropertyChanged("AnalyzeIsEnabled")
          End If
       End Set
    End Property
@@ -70,7 +70,7 @@ Public Class InstrumentPanelVM
                Map.refProjectVM.GetScene.ResetStatusGetDistance()
                Map.refStatusBarVM.NotifyStatusOutput(String.Empty)
             End If
-            OnPropertyChanged(NameOf(GetDistIsChecked))
+            OnPropertyChanged("GetDistIsChecked")
          End If
       End Set
    End Property

MachGroupPanel/MyMachGroupPanelVM.vb

@@ -1,4 +1,7 @@
-Imports System.IO
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtCAM5.MyMachinePanelVM
+Imports System.Security.Cryptography
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -68,8 +71,7 @@ Public Class MyMachGroupPanelVM
             ' se la lista gruppi è vuota creo un nuovo gruppo
             If MachGroupList.Count = 0 Then
                ' 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
-               If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then  ' Vuoi creare un nuovo Gruppo di Lavoro<br/>con i pezzi selezionati ? Sicuro di voler cancellare il Gruppo di Lavorazione?
+               If MessageBox.Show(EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
                   Return If(AddNewMachGroup(nGroupId, vPart), 0, 1)
                Else
                   Return -2
@@ -93,14 +95,13 @@ Public Class MyMachGroupPanelVM
             ' altrimenti creo il primo gruppo
          Else
             ' 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
-            If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then  ' Vuoi creare un nuovo Gruppo di Lavoro<br/>con i pezzi selezionati ? Sicuro di voler cancellare il Gruppo di Lavorazione?
+            If MessageBox.Show(EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
                Return If(AddNewMachGroup(nGroupId, vPart), 0, 1)
             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
@@ -109,10 +110,10 @@ Public Class MyMachGroupPanelVM
                nGroupId = EgtGetFirstMachGroup()
             End If
             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
@@ -127,8 +128,7 @@ Public Class MyMachGroupPanelVM
       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)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5462) & " " & sScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella esecuzione dello script automatico di disposizione ERRORE DI ESECUZIONE SCRIPT
+         MessageBox.Show(EgtMsg(MSG_DISPOSITIONERRORS + 2) & " " & sScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return False
       End If
       Dim nErr As Integer = 999
@@ -305,31 +305,30 @@ Public Class MyMachGroupPanelVM
       If Not String.IsNullOrEmpty(sDefaultSetUpName) Then
          If Not EgtImportSetup(String.Empty) Then
             EgtOutLog("Error loading default setup " & sDefaultSetUpName)
-            'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 9) & " " & sDefaultSetUpName, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6479) & " " & sDefaultSetUpName, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Errore nel caricamento del setup  Errore
+            MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 9) & " " & sDefaultSetUpName, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          End If
       End If
    End Sub
 
    Private Sub LoadMaterialType()
-      Dim sMatType As String = "Wood"
+      Dim sMatType As String = MCH_MAT_WOOD
       ' IniFile.m_sMachineName = Map.refStatusBarVM.SelectedMachine.Name
       ' IniFile.m_sCurrMachIniFilePath = Map.refStatusBarVM.SelectedMachine.MachineDirPath & "\" & Map.refStatusBarVM.SelectedMachine.Name & ".ini"
       Dim sMachineIniPath = IniFile.m_sCurrMachIniFilePath
-      EgtUILib.GetPrivateProfileString(S_GENERAL, EgtWPFLib5.EstConstMachIni.K_MATERIAL, sMatType, sMatType, sMachineIniPath)
+      EgtUILib.GetPrivateProfileString(S_MCH_GENERAL, K_MATERIAL, sMatType, sMatType, sMachineIniPath)
       Select Case sMatType
-         Case "Stone"
-            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE
-         Case "Wood"
+         Case MCH_MAT_STONE
+            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE5
+         Case MCH_MAT_WOOD
             EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.WOOD
-         Case "Beam"
+         Case MCH_MAT_BEAM
             EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.BEAM
-         Case "Additive"
+         Case MCH_MAT_ADDITIVE
             EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.WOOD
          Case Else
             ' 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))     ' Errore
+            MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
       End Select
    End Sub
 
@@ -373,8 +372,7 @@ Public Class MyMachGroupPanelVM
       Dim nSelectedMachGroupIndex As Integer = MachGroupList.IndexOf(SelectedMachGroup)
       If nSelectedMachGroupIndex = 0 And MachGroupList.Count = 1 Then
          ' chiedo conferma prima di cancellare il gruppo di lavorazione
-         'Select Case MessageBox.Show(EgtMsg(MSG_MACHGROUP + 2), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5502), "", MessageBoxButton.YesNo, MessageBoxImage.Question)    ' Sicuro di voler cancellare il Gruppo di Lavorazione?
+         Select Case MessageBox.Show(EgtMsg(MSG_MACHGROUP + 2), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                ' cancello il gruppo corrente
                EgtRemoveMachGroup(EgtGetMachGroupId(MachGroupList(nSelectedMachGroupIndex).Name))
@@ -387,8 +385,7 @@ Public Class MyMachGroupPanelVM
          End Select
       Else
          ' chiedo conferma prima di cancellare il gruppo di lavorazione
-         'Select Case MessageBox.Show(EgtMsg(MSG_MACHGROUP + 2), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5502), "", MessageBoxButton.YesNo, MessageBoxImage.Question)    ' Sicuro di voler cancellare il Gruppo di Lavorazione?
+         Select Case MessageBox.Show(EgtMsg(MSG_MACHGROUP + 2), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                Dim nNewInd As Integer = -1
                If nSelectedMachGroupIndex = 0 And MachGroupList.Count > 1 Then
@@ -423,7 +420,8 @@ Public Class MyMachGroupPanelVM
          Map.refOperationsListExpanderVM.LoadOperationList(GDB_ID.NULL)
          Map.refMachinePanelVM.UpdateCurrentMachine()
          Map.refMachiningTreeExpanderVM.UpdateOperationMachiningList()
-         Map.refEstimationsExpanderVM.Estimation_IsEnabled = (EgtUILib.GetPrivateProfileInt(S_ESTIMATIONS, K_EST_ENABLE, 0, IniFile.m_sCurrMachIniFilePath) <> 0)
+         Map.refEstimationsExpanderVM.Estimation_IsEnabled =
+                     (EgtUILib.GetPrivateProfileInt(S_ESTIMATIONS, K_EST_ENABLE, 0, IniFile.m_sCurrMachIniFilePath) <> 0)
          ' Setto il Materiale in base alla Macchina associata al MachGroup corrente
          LoadMaterialType()
          ' Zoom all

MachOptionsWindow/MachOptionV.xaml

@@ -1,25 +1,23 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MachOptionV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:local="clr-namespace:EgtCAM5"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-                            TitleBarBrush="{StaticResource EgaltechBlue1}"
-                            BorderBrush="{StaticResource EgaltechBlue1}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding CloseMachOptionsCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" SizeToContent="WidthAndHeight">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:local="clr-namespace:EgtCAM5"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+   TitleBarBrush="{StaticResource EgaltechBlue1}"
+   BorderBrush="{StaticResource EgaltechBlue1}"
+   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+   CloseCommand="{Binding CloseMachOptionsCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" SizeToContent="WidthAndHeight">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
       <local:SplitArcTypeConverter x:Key="SplitArcTypeConverter"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid Margin="10">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
+      <Grid.ColumnDefinitions>          
+         <ColumnDefinition Width="40*"/>
+         <ColumnDefinition Width="20*"/>
       </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
@@ -28,6 +26,8 @@
          <RowDefinition Height="Auto"/>
          <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">
@@ -57,17 +57,29 @@
          </ComboBox>
       </UniformGrid>
 
-      <UniformGrid Grid.Row="4" Columns="2" Margin="0,0,0,5">
+      <UniformGrid Grid.Row="4" Columns="2" Margin="0,0,0,5"
+                   Visibility="{Binding StoneVisibility}">
+         <TextBlock Text="{Binding ExtSawArcMinRadMsg}" VerticalAlignment="Center"/>
+         <TextBox Text="{Binding ExtSawArcMinRad}" Height="25" Margin="10,0,0,0"/>
+      </UniformGrid>
+
+      <UniformGrid Grid.Row="5" Columns="2" Margin="0,0,0,5"
+                   Visibility="{Binding StoneVisibility}">
+         <TextBlock Text="{Binding IntSawArcMaxSideAngMsg}" VerticalAlignment="Center"/>
+         <TextBox Text="{Binding IntSawArcMaxSideAng}" Height="25" Margin="10,0,0,0"/>
+      </UniformGrid>
+
+      <UniformGrid Grid.Row="6" 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">
+      <UniformGrid Grid.Row="7" 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}"/>
+            SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>
       </UniformGrid>
 
    </Grid>
-
+   
 </EgtWPFLib5:EgtCustomWindow>

MachOptionsWindow/MachOptionVM.vb

@@ -1,5 +1,6 @@
 Imports System.IO
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class MachOptionVM
 
@@ -48,21 +49,6 @@ 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
@@ -82,6 +68,51 @@ Public Class MachOptionVM
       End Set
    End Property
 
+   Private m_sExtSawArcMinRad As String
+   Public Property ExtSawArcMinRad As String
+      Get
+         Return m_sExtSawArcMinRad
+      End Get
+      Set(value As String)
+         Dim dExtSawArcMinRad As Double = 0
+         If StringToLen(value, dExtSawArcMinRad) Then
+            EgtMdbSetGeneralParam(MCH_GP.EXTSAWARCMINRAD, dExtSawArcMinRad)
+            EgtMdbSave()
+            m_sExtSawArcMinRad = value
+         End If
+      End Set
+   End Property
+
+   Private m_sIntSawArcMaxSideAng As String
+   Public Property IntSawArcMaxSideAng As String
+      Get
+         Return m_sIntSawArcMaxSideAng
+      End Get
+      Set(value As String)
+         Dim dIntSawArcMaxSideAng As Double = 0
+         If StringToLen(value, dIntSawArcMaxSideAng) Then
+            EgtMdbSetGeneralParam(MCH_GP.INTSAWARCMAXSIDEANG, dIntSawArcMaxSideAng)
+            EgtMdbSave()
+            m_sIntSawArcMaxSideAng = value
+         End If
+      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_ArchivedSetUpList As New List(Of String)
    Public Property ArchivedSetUpList As List(Of String)
       Get
@@ -106,36 +137,49 @@ Public Class MachOptionVM
 
    Public ReadOnly Property SafeZMsg As String
       Get
-         Return EgtMsg(6401)     ' Z di sicurezza
+         Return EgtMsg(MSG_MACHININGOPTIONPAGE + 1)
       End Get
    End Property
 
    Public ReadOnly Property SafeAggrBottZMsg As String
       Get
-         Return EgtMsg(6408)     ' Sicurezza rinvio da sotto
+         Return EgtMsg(MSG_MACHININGOPTIONPAGE + 8)
       End Get
    End Property
 
    Public ReadOnly Property HolesToleranceMsg As String
       Get
-         Return EgtMsg(6409)     ' Tolleranza fori
-      End Get
-   End Property
-   Public ReadOnly Property ApproxLinTolMsg As String
-      Get
-         Return EgtMsg(6410)     ' Tolleranza di approssimazione
+         Return EgtMsg(MSG_MACHININGOPTIONPAGE + 9)
       End Get
    End Property
 
    Public ReadOnly Property SplitArcsMsg As String
       Get
-         Return EgtMsg(6402)     ' Spezzatura archi
+         Return EgtMsg(MSG_MACHININGOPTIONPAGE + 2)
+      End Get
+   End Property
+
+   Public ReadOnly Property ExtSawArcMinRadMsg As String
+      Get
+         Return EgtMsg(6411)         ' Minimo raggio arco esterno con lama
+      End Get
+   End Property
+
+   Public ReadOnly Property IntSawArcMaxSideAngMsg As String
+      Get
+         Return EgtMsg(6412)         ' Massima inclinazione arco interno con lama
+      End Get
+   End Property
+
+   Public ReadOnly Property ApproxLinTolMsg As String
+      Get
+         Return EgtMsg(6410)         ' Tolleranza di approssimazione
       End Get
    End Property
 
    Public ReadOnly Property DefaultSetUpMsg As String
       Get
-         Return EgtMsg(6407)     ' Attrezzaggio predefinito
+         Return EgtMsg(MSG_MACHININGOPTIONPAGE + 7)
       End Get
    End Property
 
@@ -161,6 +205,14 @@ Public Class MachOptionVM
       Dim nVal As Integer = 0
       EgtMdbGetGeneralParam(MCH_GP.SPLITARCS, nVal)
       m_SelectedSplitArcs = DirectCast(nVal, MCH_SA)
+      ' Leggo minimo raggio arco esterno lavorabile con lama
+      dVal = 0
+      EgtMdbGetGeneralParam(MCH_GP.EXTSAWARCMINRAD, dVal)
+      m_sExtSawArcMinRad = LenToString(dVal, 4)
+      ' Leggo massima inclinazione lama per lavorare archi interni
+      dVal = 0
+      EgtMdbGetGeneralParam(MCH_GP.INTSAWARCMAXSIDEANG, dVal)
+      m_sIntSawArcMaxSideAng = LenToString(dVal, 4)
       ' Leggo tolleranza lineare di approssimazione
       dVal = 0
       EgtMdbGetGeneralParam(MCH_GP.APPROXLINTOL, dVal)
@@ -185,6 +237,17 @@ Public Class MachOptionVM
       End If
    End Sub
 
+#Region "Visibility"  
+   Public ReadOnly Property StoneVisibility As Visibility
+      Get
+         Dim sGenMat As String = ""
+         EgtUILib.GetPrivateProfileString(S_MCH_GENERAL, K_MATERIAL, MCH_MAT_WOOD, sGenMat, IniFile.m_sCurrMachIniFilePath)
+         Return If( sGenMat = MCH_MAT_STONE, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+#End Region
+
 #Region "COMMANDS"
 
 #Region "CloseMachOptionsCommand"
@@ -226,13 +289,13 @@ Public Class SplitArcTypeConverter
    Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
       Select Case CInt(value)
          Case MCH_SA.NEVER
-            Return EgtMsg(6403)     ' Mai
+            Return EgtMsg(MSG_MACHININGOPTIONPAGE + 3)
          Case MCH_SA.GEN_PLANE
-            Return EgtMsg(6404)     ' Piano generico
+            Return EgtMsg(MSG_MACHININGOPTIONPAGE + 4)
          Case MCH_SA.NO_XY_PLANE
-            Return EgtMsg(6405)     ' Piano diverso da XY
+            Return EgtMsg(MSG_MACHININGOPTIONPAGE + 5)
          Case Else
-            Return EgtMsg(6406)     ' Sempre
+            Return EgtMsg(MSG_MACHININGOPTIONPAGE + 6)
       End Select
    End Function
 

MachinePanel/MachinePanelV.xaml

@@ -7,14 +7,14 @@
    <StackPanel Orientation="Horizontal">
       <!--Combobox per selezionare la macchina corrente-->
       <ComboBox ItemsSource="{Binding Path=MachinesList}" DisplayMemberPath="Name"
-                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Height="22" Width="150" IsEnabled="{Binding MachineListIsEnabled}" Margin="2,0"/>
+          SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
+          Height="22" Width="150" IsEnabled="{Binding MachineListIsEnabled}" Margin="2,0"/>
       <Button Content="{Binding ToolDBMsg}"
-              Command="{Binding ToolDbCommand}"
-              IsEnabled="{Binding ToolDb_IsEnabled}"
-              Width="55"
-              ToolTip="{Binding ToolDBToolTip}"
-              Style="{StaticResource GridViewPanelButton}"/>
+            Command="{Binding ToolDbCommand}"
+            IsEnabled="{Binding ToolDb_IsEnabled}"
+            Width="55"
+            ToolTip="{Binding ToolDBToolTip}"
+            Style="{StaticResource GridViewPanelButton}"/>
       <Button Content="{Binding MachiningDbMsg}"
               Command="{Binding MachDbCommand}"
               IsEnabled="{Binding MachDb_IsEnabled}"
@@ -28,10 +28,10 @@
               ToolTip="{Binding SetUpDbToolTip}"
               Style="{StaticResource GridViewPanelButton}"/>
       <Button Command="{Binding MachOptionsCommand}"
-              ToolTip="{Binding MachOptionsToolTip}">
-         <Image Source="/Resources/MachinePanel/MachineOptions.png"
-                Height="22" />
+            ToolTip="{Binding MachOptionsToolTip}">
+          <Image Source="/Resources/MachinePanel/MachineOptions.png"
+              Height="22" />
       </Button>
-   </StackPanel>
+    </StackPanel>
 
 </EgtFloating:EgtFloatingPanel>

MachinePanel/MyMachinePanelVM.vb

@@ -64,7 +64,8 @@ Public Class MyMachinePanelVM
                IniFile.m_sCurrMachToolsDirPath = m_SelectedMachine.MachineDirPath & "\Tools"
                IniFile.m_sCurrMachSetUpDirPath = m_SelectedMachine.MachineDirPath & "\SetUp"
                IniFile.m_sCurrMachScriptsDirPath = m_SelectedMachine.MachineDirPath & "\Scripts"
-               NotifyPropertyChanged(NameOf(SelectedMachine))
+               UpdateToolAndMachDbParamVisibility()
+               NotifyPropertyChanged("SelectedMachine")
             End If
          End If
       End Set
@@ -77,7 +78,7 @@ Public Class MyMachinePanelVM
       End Get
       Set(value As Boolean)
          m_MachineListIsEnabled = value
-         NotifyPropertyChanged(NameOf(MachineListIsEnabled))
+         NotifyPropertyChanged("MachineListIsEnabled")
       End Set
    End Property
 
@@ -96,17 +97,17 @@ Public Class MyMachinePanelVM
 
    Public ReadOnly Property ToolDBMsg As String
       Get
-         Return EgtMsg(5006)     ' Db Ut.
+         Return EgtMsg(MSG_MAINWINDOW + 6)
       End Get
    End Property
    Public ReadOnly Property MachiningDbMsg As String
       Get
-         Return EgtMsg(5007)     ' Db Lav.
+         Return EgtMsg(MSG_MAINWINDOW + 7)
       End Get
    End Property
    Public ReadOnly Property SetUpDbMsg As String
       Get
-         Return EgtMsg(5009)     ' Db Att.
+         Return EgtMsg(MSG_MAINWINDOW + 9)
       End Get
    End Property
 
@@ -116,22 +117,22 @@ Public Class MyMachinePanelVM
 
    Public ReadOnly Property ToolDBToolTip As String
       Get
-         Return EgtMsg(5003)     ' Db Utensili
+         Return EgtMsg(MSG_MAINWINDOW + 3)
       End Get
    End Property
    Public ReadOnly Property MachiningDbToolTip As String
       Get
-         Return EgtMsg(5004)     ' Db Lavorazioni
+         Return EgtMsg(MSG_MAINWINDOW + 4)
       End Get
    End Property
    Public ReadOnly Property SetUpDbToolTip As String
       Get
-         Return EgtMsg(5010)     ' Db Attrezzaggio
+         Return EgtMsg(MSG_MAINWINDOW + 10)
       End Get
    End Property
    Public ReadOnly Property MachOptionsToolTip As String
       Get
-         Return EgtMsg(5008)     ' Opzioni Macchina
+         Return EgtMsg(MSG_MAINWINDOW + 8)
       End Get
    End Property
 
@@ -208,8 +209,7 @@ Public Class MyMachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtTdbReload() Then
          EgtOutLog("Impossible reloading tool Db")
-         'MessageBox.Show(EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6130), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Impossibile ricaricare il database utensili. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Errore
+         MessageBox.Show(EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
 
@@ -232,10 +232,15 @@ Public Class MyMachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtTdbReload() Then
          EgtOutLog("Impossible reloading tool Db")
-         'MessageBox.Show(EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6130), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Impossibile ricaricare il database utensili. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Errore
+         MessageBox.Show(EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
+      'Dim ToolDbWindow As New ToolsDbV
+      'ToolDbWindow.Height = 640
+      'ToolDbWindow.Width = 1024
+      'ToolDbWindow.DataContext = New ToolsDbVM
+      'ToolDbWindow.Owner = Application.Current.MainWindow
+      'ToolDbWindow.ShowDialog()
 
       Dim sMachineDir As String = IniFile.m_sMachinesRoot & "\" & IniFile.m_sMachineName
       Dim ToolDbWindowVM As New MyToolDbWindowVM(sMachineDir, IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9)
@@ -258,15 +263,14 @@ Public Class MyMachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtMdbReload() Then
          EgtOutLog("Impossible reloading machining Db")
-         'MessageBox.Show(EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6377), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Impossibile ricaricare database lavorazioni. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Errore
+         MessageBox.Show(EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True)
       Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
          MachDbWindowV.Height = 800 '674
-         MachDbWindowV.Width = 1150 '1024
+         MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()
       End If
@@ -280,15 +284,14 @@ Public Class MyMachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtMdbReload() Then
          EgtOutLog("Impossible reloading machining Db")
-         'MessageBox.Show(EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6377), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Impossibile ricaricare database lavorazioni. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Errore
+         MessageBox.Show(EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True)
       Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
          MachDbWindowV.Height = 800 '674
-         MachDbWindowV.Width = 1150 '1024
+         MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()
          If Not IsNothing(Map.refMachiningTreeExpanderVM) Then Map.refMachiningTreeExpanderVM.UpdateOperationMachiningList()
@@ -306,8 +309,7 @@ Public Class MyMachinePanelVM
       ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista
       If Not File.Exists(IniFile.m_sCurrMachScriptsDirPath & "\" & SETUP_LUA) Then
          EgtOutLog("SetUp error: SetUp configuration file doesn't exist ")
-         'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)   ' Il file di configurazione non esiste! Errore
+         MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
@@ -326,8 +328,7 @@ Public Class MyMachinePanelVM
          EgtLuaGetGlobIntVar("STU.ERR", nErr)
          If nErr = 0 Then
             If EgtGetHeadExitCount(sHead) = 0 Then
-               'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)   ' L'attrezzaggio usa una testa che non esiste sulla macchina! Errore
+               MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
                Return
             End If
          End If
@@ -357,10 +358,11 @@ Public Class MyMachinePanelVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Overrides Sub MachOptions(ByVal param As Object)
-      Dim MachOptionWindow As New MachOptionV With {
-         .DataContext = New MachOptionVM,
-         .Owner = Application.Current.MainWindow
-      }
+      Dim MachOptionWindow As New MachOptionV
+      'MachOptionWindow.Height = 614
+      'MachOptionWindow.Width = 256
+      MachOptionWindow.DataContext = New MachOptionVM
+      MachOptionWindow.Owner = Application.Current.MainWindow
       MachOptionWindow.ShowDialog()
    End Sub
 
@@ -378,7 +380,7 @@ Public Class MyMachinePanelVM
       If String.IsNullOrWhiteSpace(IniFile.m_sMachinesRoot) OrElse
          Not Directory.Exists(IniFile.m_sMachinesRoot) OrElse Directory.GetDirectories(IniFile.m_sMachinesRoot).Count = 0 Then
          IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW
-         EgtOutLog(EgtMsg(6801))    ' Direttorio Machines non trovato. EgtCAM5 funzionerà in modo solo CAD.
+         EgtOutLog(EgtMsg(MSG_STATUSBAR + 1))
          Return
       End If
       ' Cerco le macchine
@@ -388,7 +390,7 @@ Public Class MyMachinePanelVM
       Next
       If m_MachinesList.Count = 0 Then
          IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW
-         EgtOutLog(EgtMsg(6801))    ' Direttorio Machines non trovato. EgtCAM5 funzionerà in modo solo CAD.
+         EgtOutLog(EgtMsg(MSG_STATUSBAR + 1))
          Return
       End If
    End Sub
@@ -446,4 +448,14 @@ Public Class MyMachinePanelVM
 
    End Class
 
+   Private Sub UpdateToolAndMachDbParamVisibility()
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWINGONARCS, 0, IniFile.m_sCurrMachIniFilePath) <> 0 Then
+         Sawing(39) = Visibility.Visible                               ' StepExtArc
+         Sawing(40) = Visibility.Visible                               ' StepIntArc
+      Else
+         Sawing(39) = Visibility.Collapsed                               ' StepExtArc
+         Sawing(40) = Visibility.Collapsed                               ' StepIntArc
+      End If
+   End Sub
+
 End Class

MachiningDbWindow/MyMachiningDbV.xaml

@@ -1,22 +1,85 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MyMachiningDbV"
-                            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"
-                            Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-                            TitleBarBrush="{StaticResource EgaltechBlue1}"
-                            BorderBrush="{StaticResource EgaltechBlue1}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            CloseCommand="{Binding CloseMachiningsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}">
-
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+   xmlns:local="clr-namespace:EgtCAM5"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+   TitleBarBrush="{StaticResource EgaltechBlue1}"
+   BorderBrush="{StaticResource EgaltechBlue1}"
+   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+   IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+   CloseCommand="{Binding CloseMachiningsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}">
+   
    <EgtWPFLib5:EgtCustomWindow.InputBindings>
       <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
-                  CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
+         CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
    </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
-   <EgtWPFLib5:EgtCustomWindow.Resources>
+    <EgtWPFLib5:EgtCustomWindow.Resources>
       <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLap">47</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
@@ -26,70 +89,71 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
 
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="11*"/>
-         </Grid.RowDefinitions>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="11*"/>
+            </Grid.RowDefinitions>
 
-         <UniformGrid Grid.Row="0" Columns="3">
-            <Button Content="New" Command="{Binding NewCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"/>
-            <Button Content="Save" Command="{Binding SaveCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"/>
-            <Button Content="Remove" Command="{Binding RemoveCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"/>
-         </UniformGrid>
+            <UniformGrid Grid.Row="0" Columns="3">
+                <Button Content="New" Command="{Binding NewCommand}"
+               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+               IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"/>
+                <Button Content="Save" Command="{Binding SaveCommand}"
+               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+               IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"/>
+                <Button Content="Remove" Command="{Binding RemoveCommand}"
+               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+               IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"/>
+            </UniformGrid>
 
-         <TreeView Name="MachiningsTreeView" Grid.Row="1"
-                   ItemsSource="{Binding Path=MachiningsList}">
+            <TreeView Name="MachiningsTreeView" Grid.Row="1"
+            ItemsSource="{Binding Path=MachiningsList}">
 
-            <TreeView.ItemContainerStyle>
-               <Style TargetType="{x:Type TreeViewItem}">
-                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
-                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
-               </Style>
-            </TreeView.ItemContainerStyle>
+                <TreeView.ItemContainerStyle>
+                    <Style TargetType="{x:Type TreeViewItem}">
+                        <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                        <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                        <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+                    </Style>
+                </TreeView.ItemContainerStyle>
 
-            <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
+                <TreeView.Resources>
+                    <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
 
-                  <Grid >
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="1*"/>
-                     </Grid.ColumnDefinitions>
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="1*"/>
+                            </Grid.ColumnDefinitions>
 
-                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
-                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
+                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
+                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
 
-                  </Grid>
+                        </Grid>
 
-               </HierarchicalDataTemplate>
+                    </HierarchicalDataTemplate>
 
-               <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                  <Grid >
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="1*"/>
-                     </Grid.ColumnDefinitions>
+                    <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="1*"/>
+                            </Grid.ColumnDefinitions>
 
-                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="18" FontSize="15"  Margin="10"/>
+                            <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                            <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="18" FontSize="15"  Margin="10"/>
 
-                  </Grid>
-               </DataTemplate>
-            </TreeView.Resources>
+                        </Grid>
+                    </DataTemplate>
+                </TreeView.Resources>
 
-         </TreeView>
+            </TreeView>
 
-      </Grid>
-
-      <ContentControl Content="{Binding ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
+        </Grid>
 
+        <ContentControl Content="{Binding ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
+            
    </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>

MainWindow/MainWindowV.xaml

@@ -1,16 +1,16 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            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="{Binding IconSource}"
-                            TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
-                            BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
-                            MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
-                            AboutBoxCommand="{Binding AboutBoxCommand}"
-                            AllowDrop="True" Drop="MainWindow_Drop"
-                            CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   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="{Binding IconSource}"
+   TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
+   BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
+   MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
+   AboutBoxCommand="{Binding AboutBoxCommand}"
+   AllowDrop="True" Drop="MainWindow_Drop"
+   CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
    <EgtWPFLib5:EgtCustomWindow.TitlePanel>
       <local:TopCommandBarV DataContext="{StaticResource TopCommandBarViewModel}"/>
    </EgtWPFLib5:EgtCustomWindow.TitlePanel>

MainWindow/MainWindowV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5
+Imports System.ComponentModel
+Imports EgtWPFLib5
 
 Class MainWindowV
    Inherits EgtCustomWindow

MainWindow/MainWindowVM.vb

@@ -1,4 +1,7 @@
-Imports System.Threading
+Imports System.Collections.ObjectModel
+Imports System.Threading
+Imports System.Windows.Threading
+Imports System.Runtime.InteropServices
 Imports System.Math
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -38,11 +41,18 @@ Public Class MainWindowVM
       Set(value As String)
          If value <> m_Title Then
             m_Title = value
-            OnPropertyChanged(NameOf(Title))
+            OnPropertyChanged("Title")
          End If
       End Set
    End Property
 
+   Private m_sDimensionDir As String = String.Empty
+   Public ReadOnly Property DimensionDir As String
+      Get
+         Return m_sDimensionDir
+      End Get
+   End Property
+
    Private m_cmdMainWindow_ContentRendered As ICommand
    Private m_cmdAboutBox As ICommand
    ' MainWindow Activated Event
@@ -58,9 +68,8 @@ Public Class MainWindowVM
    Public ReadOnly Property TopCommandBar As TopCommandBarV
       Get
          If IsNothing(m_TopCommandBar) Then
-            m_TopCommandBar = New TopCommandBarV With {
-               .DataContext = New TopCommandBarVM
-            }
+            m_TopCommandBar = New TopCommandBarV
+            m_TopCommandBar.DataContext = New TopCommandBarVM
          End If
          Return m_TopCommandBar
       End Get
@@ -73,9 +82,8 @@ Public Class MainWindowVM
       Get
          If m_bfirst Then
             m_bfirst = False
-            m_StatusBar = New StatusBarV With {
-               .DataContext = New MyStatusBarVM
-            }
+            m_StatusBar = New StatusBarV
+            m_StatusBar.DataContext = New MyStatusBarVM
          End If
          Return m_StatusBar
       End Get
@@ -87,9 +95,8 @@ Public Class MainWindowVM
       Get
          If m_bFirstProjectPage Then
             m_bFirstProjectPage = False
-            m_ProjectPage = New ProjectV With {
-               .DataContext = New ProjectVM
-            }
+            m_ProjectPage = New ProjectV
+            m_ProjectPage.DataContext = New ProjectVM
          End If
          Return m_ProjectPage
       End Get
@@ -137,9 +144,8 @@ Public Class MainWindowVM
 
    ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
    Public Sub AboutBox(ByVal param As Object)
-      Dim AboutBoxWindow As New AboutBoxWndV With {
-         .Owner = Application.Current.MainWindow
-      }
+      Dim AboutBoxWindow As New AboutBoxWndV
+      AboutBoxWindow.Owner = Application.Current.MainWindow
       AboutBoxWindow.ShowDialog()
    End Sub
 
@@ -190,13 +196,7 @@ Public Class MainWindowVM
          ' Salvo impostazione macchina corrente
          Map.refMachinePanelVM.SaveCurrentMachine()
          ' 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()
+         ReleaseInstance()
          ' Chiudo la finestra principale del programma
          Application.Current.MainWindow.Close()
       Else
@@ -204,15 +204,9 @@ Public Class MainWindowVM
       End If
    End Sub
 
-   Private Function OnTerminateProcess( nExitCode As Integer) As Boolean
+   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()
+      ReleaseInstance()
       ' Dichiaro di procedere con la terminazione del programma
       Return True
    End Function
@@ -307,12 +301,9 @@ Public Class MainWindowVM
       Map.refMainWindowVM.ManageClosingApplication()
       ' Terminazione generale di EgtInterface
       EgtExit()
-      ' Rilascio mutex
-      If Not IsNothing(m_objMutex) Then m_objMutex.Close()
       ' Aggiorno istanze usate
-      Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
-      nTmp -= (1 << (IniFile.m_nInstance - 1))
-      WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
+      ReleaseInstance()
+      ' Termino
       Application.Current.Shutdown()
    End Sub
 
@@ -363,6 +354,8 @@ Public Class MainWindowVM
       Else
          IniFile.m_sToolMakersDir = m_sDataRoot & "\" & TOOLMAKER_DFL_DIR
       End If
+      ' Recupero percorso file Dimension
+      m_sDimensionDir = m_sConfigDir & "\" & DIMENSION_FILE_NAME
       ' Verifico indice di istanza
       ManageInstance()
       ' Imposto tipo di chiave
@@ -386,8 +379,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2703, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2703, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3103, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 3103, 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
@@ -530,6 +523,17 @@ Public Class MainWindowVM
          End If
       End If
    End Sub
+   
+   Private Sub ReleaseInstance()
+      ' Aggiorno istanze usate
+      Dim bOk As Boolean = 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())
+      If bOk Then m_objMutex.ReleaseMutex()
+      ' Rilascio mutex
+      If Not IsNothing(m_objMutex) Then m_objMutex.Close()
+   End Sub
 
    Friend Sub NotifyMainWindow_ContentRendered()
       ' Notifico ProjectVM
@@ -598,18 +602,25 @@ Public Class MainWindowVM
          ' pulisco output
          Map.refStatusBarVM.NotifyStatusOutput("")
          Map.refInputExpanderVM.ResetInputBox()
-         If not IsNothing( Map.refMachiningParameterExpanderVM) Then
+         If Not IsNothing(Map.refMachiningParameterExpanderVM) Then
             ' Nascondo la combobox delle usernotes
             Map.refMachiningParameterExpanderVM.CurrOperation.SetComboAddVisibility(Visibility.Collapsed)
             'riattivo il pulsante per visualizzare la combobox delle note
             Map.refMachiningParameterExpanderVM.CurrOperation.SetShowNoteListCombo_IsEnable(True)
          End If
-      ElseIf e.Key = Key.Left OrElse e.Key = Key.Right OrElse e.Key = Key.Up OrElse e.Key = Key.Down AndAlso
-             Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
+      ElseIf (e.Key = Key.Left OrElse e.Key = Key.Right) AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
          Map.refMachiningParameterExpanderVM.FocusSlider()
-         Dim nStep As Integer = If(e.Key = Key.Right OrElse e.Key = Key.Up, 1, -1)
+         Dim nStep As Integer = If(e.Key = Key.Right, 1, -1)
          Map.refMachiningParameterExpanderVM.SetSliderValue(nStep)
          e.Handled = True
+      ElseIf (e.Key = Key.Up OrElse e.Key = Key.Down) AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
+         Map.refMachiningParameterExpanderVM.FocusButtonPreview()
+         If e.Key = Key.Down Then
+            Map.refMachiningParameterExpanderVM.RevertPreviewMachiningTool()
+         Else
+            Map.refMachiningParameterExpanderVM.PreviewMachiningTool()
+         End If
+         e.Handled = True
       End If
    End Sub
 
@@ -622,11 +633,12 @@ Public Class MainWindowVM
    ''' </summary>
    Private m_allowWindowToClose As Boolean = False
 
+
 #End Region
 
 #Region "MEF Plugin"
 
-   Private m_Loader As New MEFLoader()
+   Private m_Loader As MEFLoader = New MEFLoader()
 
    Private Function GetPathByName(ByVal name As String) As String
       Dim PluginNameSplit() As String = name.Split("."c)

My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("EgtCAM5")>
-<Assembly: AssemblyCopyright("Copyright ©  2016-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2016-2026 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.7.3.1")>
-<Assembly: AssemblyFileVersion("2.7.3.1")>
+<Assembly: AssemblyVersion("3.1.3.2")>
+<Assembly: AssemblyFileVersion("3.1.3.2")>
 

My Project/Resources.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.34209
+'     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  A strongly-typed resource class, for looking up localized strings, etc.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

My Project/Settings.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.34209
+'     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -12,15 +12,16 @@ Option Strict On
 Option Explicit On
 
 
-
-<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"),  _
- Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-Partial Friend NotInheritable Class MySettings
-    Inherits Global.System.Configuration.ApplicationSettingsBase
-    
-    Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+Namespace My
     
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
 #Region "My.Settings Auto-Save Functionality"
 #If _MyType = "WindowsForms" Then
     Private Shared addedHandler As Boolean
@@ -28,17 +29,17 @@ Partial Friend NotInheritable Class MySettings
     Private Shared addedHandlerLockObject As New Object
 
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
         If My.Application.SaveMySettingsOnExit Then
             My.Settings.Save()
         End If
     End Sub
 #End If
 #End Region
-    
-    Public Shared ReadOnly Property [Default]() As MySettings
-        Get
-            
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
 #If _MyType = "WindowsForms" Then
                If Not addedHandler Then
                     SyncLock addedHandlerLockObject
@@ -49,10 +50,11 @@ Partial Friend NotInheritable Class MySettings
                     End SyncLock
                 End If
 #End If
-            Return defaultInstance
-        End Get
-    End Property
-End Class
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
 
 Namespace My
     
@@ -62,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.EgtCAM5.MySettings
+        Friend ReadOnly Property Settings() As Global.EgtCAM5.My.MySettings
             Get
-                Return Global.EgtCAM5.MySettings.Default
+                Return Global.EgtCAM5.My.MySettings.Default
             End Get
         End Property
     End Module

OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml

@@ -7,10 +7,8 @@
       <Expander.Header>
          <TextBlock Text="{Binding PropertiesMsg}"/>
       </Expander.Header>
-      <UniformGrid>
-         <TextBox Text="{Binding InfoBox, Mode=OneWay}" MaxHeight="100" IsReadOnly="True"
-                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-      </UniformGrid>
+      <TextBox Text="{Binding InfoBox, Mode=OneWay}" IsReadOnly="True"
+               HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
    </Expander>
 
 </UserControl>

OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb

@@ -7,7 +7,7 @@ Public Class InfoExpanderVM
 
    Public ReadOnly Property PropertiesMsg As String
       Get
-         Return EgtMsg(5351)     ' Proprietà
+         Return EgtMsg(MSG_DRAWOPTION + 1)
       End Get
    End Property
 
@@ -21,7 +21,8 @@ Public Class InfoExpanderVM
       Set(value As Boolean)
          If value <> m_IsExpanded Then
             m_IsExpanded = value
-            OnPropertyChanged(NameOf(IsEnabled))
+            Map.refDrawOptionPanelVM.SetInfoRowIsExpanded(m_IsExpanded)
+            OnPropertyChanged("IsEnabled")
          End If
       End Set
    End Property
@@ -39,7 +40,7 @@ Public Class InfoExpanderVM
             Else
                IsEnabled = False
             End If
-            OnPropertyChanged(NameOf(InfoBox))
+            OnPropertyChanged("InfoBox")
          End If
       End Set
    End Property

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml

@@ -1,11 +1,13 @@
 <UserControl x:Class="InputExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <Expander Header="{Binding Title}" IsExpanded="{Binding IsExpanded}" IsEnabled="{Binding IsEnabled}"
              Style="{StaticResource ExpanderStyle}">
       <StackPanel>
-         <!--<StackPanel.Style>
+         <StackPanel.Style>
             <Style TargetType="{x:Type StackPanel}">
                <Style.Triggers>
                   <DataTrigger Binding="{Binding FocusTextBox}" Value="True">
@@ -13,7 +15,7 @@
                   </DataTrigger>
                </Style.Triggers>
             </Style>
-         </StackPanel.Style>-->
+         </StackPanel.Style>
          <TextBlock Text="{Binding TextBlock}"
                     Visibility="{Binding TextVisibility}" Margin="5,5,0,5"/>
          <Grid>
@@ -21,9 +23,9 @@
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <TextBox x:Name="Txt" Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"  
-                     PreviewKeyDown="TextBox_PreviewKeyDown" Height="Auto"
-                     Visibility="{Binding TextVisibility}" Margin="5,0,5,5" IsEnabled="True" Focusable="True" >
+            <TextBox x:Name="Txt" Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"                       
+                     PreviewKeyDown="TextBox_PreviewKeyDown" IsVisibleChanged="Txt_IsVisibleChanged"
+                     Visibility="{Binding TextVisibility}" Height="Auto" Margin="5,0,5,5" >
                <TextBox.InputBindings>
                   <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
                   <KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>
@@ -32,50 +34,17 @@
             <Button Grid.Column="1" 
                     Content="+"
                     Command="{Binding ShowInfoItemCommand}"
-                    Visibility="Collapsed"
+                    Visibility="{Binding ShowInfoItemVisibility}"
                     Width="20"
                     Height="20"
                     Margin="5,-1,5,0" 
                     VerticalAlignment="Top"/>
-            <!--Visibility="{Binding ShowInfoItemVisibility}"-->
          </Grid>
          <CheckBox Content="{Binding CheckBoxText}" IsChecked="{Binding IsChecked}"
                    Visibility="{Binding CheckVisibility}" Margin="5,0,5,5"/>
          <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
                    Visibility="{Binding ComboVisibility}" Margin="5,5,5,5"/>
 
-         <ItemsControl ItemsSource="{Binding InfoList}"
-                       Visibility="{Binding InfoVisibility}"
-                       Margin="5,5,0,10">
-            <ItemsControl.ItemTemplate>
-               <DataTemplate>
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <TextBlock Text="{Binding Key}"
-                                Width="70"
-                                Margin="0,6,-15,0"/>
-                     <TextBox Grid.Column="1" 
-                              Text="{Binding Valour, UpdateSourceTrigger=PropertyChanged}"
-                              Margin="0,5,5,10">
-                        <TextBox.InputBindings>
-                           <KeyBinding Key="Enter" Command="{Binding DoneInfoCommand}"/>
-                        </TextBox.InputBindings>
-                     </TextBox>
-                     <Button Grid.Column="2" 
-                             Content="-"
-                             Command="{Binding RemoveInfoItemCommand}"
-                             Width="20"
-                             Height="20"
-                             Margin="5,-2,5,5"/>
-                  </Grid>
-               </DataTemplate>
-            </ItemsControl.ItemTemplate>
-         </ItemsControl>
-
          <Grid Margin="5,0,5,5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb

@@ -1,24 +1,17 @@
 Public Class InputExpanderV
 
-   Sub New()
-
-      ' La chiamata è richiesta dalla finestra di progettazione.
-      InitializeComponent()
-
-      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
-      'TextBoxFocus.Focus()
-      AddHandler Map.refInputExpanderVM.m_FocusOnTextBox, AddressOf FocusOnText
-   End Sub
-
-   Friend Sub FocusOnText()
-      Me.Txt.Focus()
-   End Sub
-
    Private Sub TextBox_PreviewKeyDown(sender As Object, e As KeyEventArgs)
-      If e.Key = Key.Enter And Keyboard.Modifiers = ModifierKeys.Shift Then
+      If (e.Key = Key.Enter And (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift) Or
+         (e.Key = Key.V And (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control) Then
          Txt.AcceptsReturn = True
          Txt.TextWrapping = TextWrapping.Wrap
       End If
    End Sub
 
+   Private Sub Txt_IsVisibleChanged(sender As Object, e As DependencyPropertyChangedEventArgs)
+      If Txt.IsVisible Then
+         Txt.Focus()
+      End If
+   End Sub
+
 End Class

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb

@@ -7,24 +7,11 @@ Public Class InputExpanderVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Friend Event m_FocusOnTextBox()
-
    ' Variabile temporanea per salvare bShow
-   Private m_tmpbShow As Boolean
+   Private m_bTempShow As Boolean
 
-   Private m_tmpInfoList As New ObservableCollection(Of InfoItem)
-   ''' <summary>
-   ''' Lista temporanea delle info
-   ''' </summary>
-   Private Property tmpInfoList As ObservableCollection(Of InfoItem)
-      Get
-         Return m_tmpInfoList
-      End Get
-      Set(value As ObservableCollection(Of InfoItem))
-         m_tmpInfoList = value
-         OnPropertyChanged("tmpInfoList")
-      End Set
-   End Property
+   ' Lista temporanea delle Info
+   Private m_TempInfoList As New List(Of InfoItem)
 
    ' Expander fields
    Private m_IsExpanded As Boolean
@@ -34,7 +21,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_IsExpanded = value
-         OnPropertyChanged(NameOf(IsExpanded))
+         OnPropertyChanged("IsExpanded")
       End Set
    End Property
 
@@ -45,7 +32,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_IsEnabled = value
-         OnPropertyChanged(NameOf(IsEnabled))
+         OnPropertyChanged("IsEnabled")
       End Set
    End Property
 
@@ -56,7 +43,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_Title = value
-         OnPropertyChanged(NameOf(Title))
+         OnPropertyChanged("Title")
       End Set
    End Property
 
@@ -68,7 +55,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_TextBlock = value
-         OnPropertyChanged(NameOf(TextBlock))
+         OnPropertyChanged("TextBlock")
       End Set
    End Property
 
@@ -81,7 +68,7 @@ Public Class InputExpanderVM
       Set(value As String)
          m_TextBox = value
          Map.refProjectVM.NotifyInputText(value)
-         OnPropertyChanged(NameOf(TextBox))
+         OnPropertyChanged("TextBox")
       End Set
    End Property
 
@@ -93,7 +80,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_TextVisibility Then
             m_TextVisibility = value
-            OnPropertyChanged(NameOf(TextVisibility))
+            OnPropertyChanged("TextVisibility")
          End If
       End Set
    End Property
@@ -105,7 +92,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_FocusTextBox = value
-         OnPropertyChanged(NameOf(FocusTextBox))
+         OnPropertyChanged("FocusTextBox")
       End Set
    End Property
 
@@ -117,7 +104,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_CheckBoxText = value
-         OnPropertyChanged(NameOf(CheckBoxText))
+         OnPropertyChanged("CheckBoxText")
       End Set
    End Property
 
@@ -130,7 +117,7 @@ Public Class InputExpanderVM
          If value <> m_IsChecked Then
             Map.refProjectVM.SetLastBoolean(value)
             m_IsChecked = value
-            OnPropertyChanged(NameOf(IsChecked))
+            OnPropertyChanged("IsChecked")
          End If
       End Set
    End Property
@@ -143,7 +130,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_CheckVisibility Then
             m_CheckVisibility = value
-            OnPropertyChanged(NameOf(CheckVisibility))
+            OnPropertyChanged("CheckVisibility")
          End If
       End Set
    End Property
@@ -156,21 +143,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As ObservableCollection(Of String))
          m_ComboItemsList = value
-         OnPropertyChanged(NameOf(ComboItemsList))
-      End Set
-   End Property
-
-   Private m_InfoList As New ObservableCollection(Of InfoItem)
-   ''' <summary>
-   ''' Lista delle info modificate
-   ''' </summary>
-   Public Property InfoList As ObservableCollection(Of InfoItem)
-      Get
-         Return m_InfoList
-      End Get
-      Set(value As ObservableCollection(Of InfoItem))
-         m_InfoList = value
-         OnPropertyChanged("InfoList")
+         OnPropertyChanged("ComboItemsList")
       End Set
    End Property
 
@@ -180,27 +153,26 @@ Public Class InputExpanderVM
          Return m_ComboSelectedIndex
       End Get
       Set(value As Integer)
-         If m_tmpbShow Then Map.refProjectVM.SetLastInteger(value)
+         If m_bTempShow Then Map.refProjectVM.SetLastInteger(value)
          m_ComboSelectedIndex = value
-         ' Assegno l'indice selezionato ad una variabile temporanea per utilizzarlo quando rimuovo l'info dalla lista
-         Dim tmpComboSelectedIndex As Integer = ComboSelectedIndex
-         ' Controllo se l'indice è maggiore o uguale a zero e la lista tmp contiene valori
-         If m_ComboSelectedIndex >= 0 AndAlso tmpInfoList.Count > 0 Then
-            ' Controllo se la info è contenuta nella lista ComboItemsList
-            If ComboItemsList.Contains(tmpInfoList(m_ComboSelectedIndex).sKey) Then
-               ' Aggiungo la info alla lista per visualizzarla
-               InfoList.Add(New InfoItem(tmpInfoList(m_ComboSelectedIndex).nId, tmpInfoList(m_ComboSelectedIndex).sKey, m_tmpInfoList(m_ComboSelectedIndex).sValour))
-               ' Nascondo la combobox
-               ComboVisibility = Visibility.Collapsed
-               ' Rimuovo la info dalla ComboItemsList
-               ComboItemsList.Remove(tmpInfoList(m_ComboSelectedIndex).sKey)
+         ' se la combo è di Info ed è valida, la aggiungo alla textbox
+         If m_ComboSelectedIndex >= 0 AndAlso m_TempInfoList.Count() > 0 Then
+            Dim CurrItem As InfoItem = m_TempInfoList(m_ComboSelectedIndex)
+            If String.IsNullOrEmpty(m_TextBox) Then
+               m_TextBox = CurrItem.sKey & "=" & CurrItem.sValue
+            Else
+               If Not m_TextBox.EndsWith(vbCrLf) Then m_TextBox &= vbCrLf
+               m_TextBox &= CurrItem.sKey & "=" & CurrItem.sValue
             End If
-            ' Rimuovo la info dalla tmpInfoList
-            tmpInfoList.Remove(tmpInfoList(tmpComboSelectedIndex))
+            ComboVisibility = Visibility.Collapsed
+            ComboItemsList.RemoveAt(m_ComboSelectedIndex)
+            m_TempInfoList.RemoveAt(m_ComboSelectedIndex)
+            m_ComboSelectedIndex = -1
+            If ComboItemsList.Count <= 0 Then ShowInfoItemVisibility = Visibility.Collapsed
          End If
-         OnPropertyChanged(NameOf(ComboSelectedIndex))
+         OnPropertyChanged("ComboSelectedIndex")
          OnPropertyChanged("ComboItemsList")
-         OnPropertyChanged("InfoList")
+         OnPropertyChanged("TextBox")
       End Set
    End Property
 
@@ -212,7 +184,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_ComboVisibility Then
             m_ComboVisibility = value
-            OnPropertyChanged(NameOf(ComboVisibility))
+            OnPropertyChanged("ComboVisibility")
          End If
       End Set
    End Property
@@ -225,7 +197,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Visibility)
          m_ShowBtnVisibility = value
-         OnPropertyChanged(NameOf(ShowBtnVisibility))
+         OnPropertyChanged("ShowBtnVisibility")
       End Set
    End Property
 
@@ -245,38 +217,21 @@ Public Class InputExpanderVM
       End Set
    End Property
 
-   Private m_InfoVisibility As Visibility
-   ''' <summary>
-   ''' Propietà visibilità lista info modificate
-   ''' </summary>
-   Public Property InfoVisibility As Visibility
-      Get
-         Return m_InfoVisibility
-      End Get
-      Set(value As Visibility)
-         If value <> m_InfoVisibility Then
-            m_InfoVisibility = value
-            OnPropertyChanged("InfoVisibility")
-         End If
-      End Set
-   End Property
-
    ' Commands definition
    Private m_cmdShow As ICommand
    Private m_cmdDone As ICommand
    Private m_cmdShowInfoItem As ICommand
-   Private m_cmdRemoveInfoItem As ICommand
 
 #Region "Messages"
 
    Public ReadOnly Property ShowMsg As String
       Get
-         Return EgtMsg(5364)     ' Mostra
+         Return EgtMsg(MSG_DRAWOPTION + 14)
       End Get
    End Property
    Public ReadOnly Property OkMsg As String
       Get
-         Return EgtMsg(5365)     ' Conferma
+         Return EgtMsg(MSG_DRAWOPTION + 15)
       End Get
    End Property
 
@@ -289,6 +244,7 @@ Public Class InputExpanderVM
    Sub New()
       ' Creo riferimento a questa classe in EgtCAM5Map
       Map.SetRefInputExpanderVM(Me)
+      ComboSelectedIndex = -1
    End Sub
 
 #End Region    ' Constructor
@@ -343,15 +299,6 @@ Public Class InputExpanderVM
    ''' Execute the Point.  This method is invoked by the PointCommand.
    ''' </summary>
    Public Sub Done(ByVal param As Object)
-      ' Controllo se la lista contenente la info modificata sia presente
-      If InfoList.Count > 0 Then
-         ' Ciclo sulla lista
-         For Each Item As InfoItem In InfoList
-            Map.refProjectVM.NotifyInputText((Item.Key & "=" & Item.Valour).Trim())
-            ' Assegno a m_TextBox la info modificata
-            m_TextBox &= vbCrLf & (Item.Key & "=" & Item.Valour).Trim() & vbCrLf
-         Next
-      End If
       Map.refProjectVM.Done(m_TextBox)
    End Sub
 
@@ -383,6 +330,18 @@ Public Class InputExpanderVM
    ''' </summary>
    ''' <param name="param"></param>
    Public Sub ShowInfoItem(ByVal param As Object)
+      ' Se presente info inserita in textbox
+      If Not String.IsNullOrWhiteSpace( m_TextBox) Then
+         Dim vLines As String() = m_TextBox.Split( vbCrLf.ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
+         For Each sLine As String In vLines
+            Dim vKeyVal As String() = sLine.Split("="c)
+            Dim nInd As Integer = m_TempInfoList.FindIndex( Function(x) x.sKey = vKeyVal(0))
+            If nInd <> -1 Then
+               ComboItemsList.RemoveAt( nInd)
+               m_TempInfoList.RemoveAt( nInd)
+            End If
+         Next
+      End If
       ComboVisibility = Visibility.Visible
    End Sub
 
@@ -392,32 +351,19 @@ Public Class InputExpanderVM
 
 #Region "METHODS"
 
-   Friend Sub FocusText()
-      RaiseEvent m_FocusOnTextBox()
-   End Sub
-
    Friend Sub PrepareInputBox(PrepareInputBoxParam As PrepareInputBoxParam)
-      Title = PrepareInputBoxParam.sTitle
+      ' Divido il titolo che può contenere comandi dopo il ';'
+      Dim vsSplitTitle As String() = PrepareInputBoxParam.sTitle.Split(";"c)
+      Title = vsSplitTitle(0)
       If PrepareInputBoxParam.sLabel <> "" Then
          TextBlock = PrepareInputBoxParam.sLabel
          TextBox = ""
          TextVisibility = Visibility.Visible
-         ' Controllo se il titolo è uguale a INFO se si
-         If Title = EgtMsg(5359).ToUpper() Then
-            ' Metto tmpbShow a false
-            m_tmpbShow = False
-            ' Rendo visibile il pulsante che mostra la lista delle info
-            ShowInfoItemVisibility = Visibility.Visible
-            ' Rendo visibile la lista delle info selezionate
-            InfoVisibility = Visibility.Visible
-            ' Pulisco la lista tmpInfoList
-            tmpInfoList.Clear()
-            ' Pulisco la lista InfoList
-            InfoList.Clear()
-            ' Pulisco la lista ComboItemsList
-            ComboItemsList.Clear()
-            ' Popolo la lista ComboItemsList
+         ' Se presente il comando "Sic=1"
+         If vsSplitTitle.Count() > 1 AndAlso vsSplitTitle(1) = "Sic=1" Then
+            m_bTempShow = False
             ComboInfo()
+            If ComboItemsList.Count > 0 Then ShowInfoItemVisibility = Visibility.Visible
          End If
       End If
       If PrepareInputBoxParam.sCheckLabel <> "" Then
@@ -425,14 +371,9 @@ Public Class InputExpanderVM
          CheckVisibility = Visibility.Visible
       End If
       If PrepareInputBoxParam.bShowCombo Then
-         ' Assegno a tmpbShow PrepareInputBoxParam.bShowCombo
-         m_tmpbShow = PrepareInputBoxParam.bShowCombo
-         ' Pulisco la lista ComboItemsList
+         m_bTempShow = PrepareInputBoxParam.bShowCombo
          ComboItemsList.Clear()
-         ' Pulisco la lista tmpInfoList
-         tmpInfoList.Clear()
-         ' Pulisco la lista InfoList
-         InfoList.Clear()
+         m_TempInfoList.Clear()
          ComboVisibility = Visibility.Visible
       End If
       If PrepareInputBoxParam.bShowBtn Then
@@ -441,17 +382,15 @@ Public Class InputExpanderVM
       IsEnabled = True
       IsExpanded = True
       FocusTextBox = True
-      FocusText()
    End Sub
 
    Friend Sub ResetInputBox()
-      Title = EgtMsg(5355)    ' Parametri di disegno
+      Title = EgtMsg(MSG_DRAWOPTION + 5)
       TextVisibility = Visibility.Collapsed
       CheckVisibility = Visibility.Collapsed
       ComboVisibility = Visibility.Collapsed
       ShowBtnVisibility = Visibility.Collapsed
       ShowInfoItemVisibility = Visibility.Collapsed
-      InfoVisibility = Visibility.Collapsed
       IsExpanded = False
       IsEnabled = False
    End Sub
@@ -459,7 +398,6 @@ Public Class InputExpanderVM
    Friend Function SetInputBoxText(ByVal sVal As String) As Boolean
       TextBox = sVal
       FocusTextBox = True
-      FocusText()
       Return True
    End Function
 
@@ -487,33 +425,22 @@ Public Class InputExpanderVM
       Return True
    End Function
 
-   ''' <summary>
-   ''' Rimovi nota da info lista
-   ''' </summary>
-   ''' <param name="InfoItem">Informazione da eliminare</param>
-   Friend Sub RemoveItemInfo(InfoItem As InfoItem)
-      ' Rimuovo info da lista modifica
-      InfoList.Remove(InfoItem)
-      ' Riaggiungo la info eliminata
-      ComboItemsList.Add(InfoItem.sKey)
-      ' Riaggiungo la info eliminata
-      tmpInfoList.Add(InfoItem)
-   End Sub
-
    ''' <summary>
    ''' Funzione che popola la lista ComboItemsList
    ''' </summary>
    Private Sub ComboInfo()
-      '''''''''''''''''''''''''''''' Recuperare funzione egtgetallinfo quando sarà pronta
-      Dim val As Integer
-      If Not m_tmpbShow Then
-         For Ind As Integer = 0 To 6
-            val += Ind
-            tmpInfoList.Add(New InfoItem(Ind, "A" & +Ind, val.ToString()))
-         Next
 
-         For Each InfoItem As InfoItem In tmpInfoList
-            ComboItemsList.Add(InfoItem.sKey)
+      m_TempInfoList.Clear()
+      ComboItemsList.Clear()
+
+      Dim vsInfo As String() = Nothing
+      EgtGetAllInfo( Map.refManageLayerExpanderVM.RightClickedTreeItemId, vsInfo)
+
+      If Not m_bTempShow And Not IsNothing( vsInfo) Then
+         For nInd As Integer = 0 To vsInfo.Count() - 1
+            Dim vKeyVal As String() = vsInfo( nInd).Split("="c)
+            m_TempInfoList.Add(New InfoItem( nInd, vKeyVal(0), vKeyVal(1)))
+            ComboItemsList.Add( vsInfo( nInd))
          Next
       End If
    End Sub

OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb

@@ -19,11 +19,12 @@ Public Class LayerTreeViewItem
    ''' </summary>
    Public Overrides Property IsSelected As Boolean
       Get
-         Return m_IsSelected
+         Return m_isSelected
       End Get
       Set(value As Boolean)
-         If (value <> m_IsSelected) Then
-            m_IsSelected = value
+         If (value <> m_isSelected) Then
+            m_isSelected = value
+            Map.refDrawOptionPanelVM.SetInfoRowIsExpanded(value)
             If value Then
                ' recupero l'Id del nuovo oggetto selezionato
                Map.refManageLayerExpanderVM.IsRightClickedLayerTreeItem(False)
@@ -74,12 +75,12 @@ Public Class LayerTreeViewItem
             m_bOnOff = value
             ' se abilitato, eseguo operazione
             If m_SendCmd Then
-               Map.refProjectVM.SetLastInteger(Id)
                If value Then
-                  Map.refProjectVM.ExecuteCommand(Controller.CMD.SHOW)
+                  EgtSetStatus(Id, GDB_ST.ON_)
                Else
-                  Map.refProjectVM.ExecuteCommand(Controller.CMD.HIDE)
+                  EgtSetStatus(Id, GDB_ST.OFF)
                End If
+               EgtDraw()
             End If
             Dim bOnOffGroup As Boolean = ((Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift) AndAlso Items.Count > 0
             If bOnOffGroup Then
@@ -115,7 +116,7 @@ Public Class LayerTreeViewItem
    Public Sub SetHidden(bVal As Boolean)
       If bVal <> m_bHidden Then
          m_bHidden = bVal
-         NotifyPropertyChanged(Name(IsHidden))
+         NotifyPropertyChanged("IsHidden")
       End If
    End Sub
 
@@ -127,7 +128,7 @@ Public Class LayerTreeViewItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged(NameOf(PictureString))
+            NotifyPropertyChanged("PictureString")
          End If
       End Set
    End Property

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml

@@ -5,7 +5,7 @@
              xmlns:expression="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions"
              xmlns:local="clr-namespace:EgtCAM5">
 
-   <Expander IsExpanded="True" Style="{StaticResource ExpanderStyle}">
+   <Expander IsExpanded="{Binding ManageLayerIsExpanded}" Style="{StaticResource ExpanderStyle}">
       <Expander.Header>
          <StackPanel Orientation="Horizontal">
             <TextBlock Text="{Binding HeaderName}" Margin="0,0,5,0"/>
@@ -13,7 +13,11 @@
          </StackPanel>
       </Expander.Header>
 
-      <StackPanel>
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
 
          <UniformGrid Rows="1">
             <Button Content="{Binding NewPartMsg}" Command="{Binding NewPartCommand}"  Height="30"/>
@@ -21,9 +25,8 @@
             <Button Content="{Binding ColorMsg}" Command="{Binding LayerColorCommand}"  Height="30"/>
          </UniformGrid>
 
-         <TreeView x:Name="LayerTreeView" MinHeight="150" MaxHeight="250" 
+         <TreeView Grid.Row="1" x:Name="LayerTreeView"
                    ItemsSource="{Binding Path=LayerList}"
-                   SelectedItemChanged="LayerTreeView_SelectedItemChanged"
                    VirtualizingStackPanel.IsVirtualizing = "True"
                    VirtualizingStackPanel.VirtualizationMode = "Recycling">
             <interactivity:Interaction.Triggers>
@@ -54,8 +57,9 @@
                      <ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}" Grid.Column="0" 
                                    IsChecked="{Binding OnOff}" Visibility="{Binding IsHidden}" Focusable="True" Height="15" Width="15" Margin="0,0,5,0"/>
                      <Image Grid.Column="1" Source="{Binding PictureString}" Height="15" Margin="0,0,5,0"/>
-                     <TextBlock Grid.Column="2" Text="{Binding Name}" Margin="0,0,5,0" Name="Pippo"/>
+                     <TextBlock Grid.Column="2" Text="{Binding Name}" Margin="0,0,5,0"/>
                      <Ellipse Grid.Column="3" Height="10" Width="10" Fill="{Binding LayerColor}" />
+
                   </Grid>
                </HierarchicalDataTemplate>
             </TreeView.Resources>
@@ -116,6 +120,6 @@
                </ContextMenu>
             </TreeView.ContextMenu>
          </TreeView>
-      </StackPanel>
+      </Grid>
    </Expander>
 </UserControl>

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml.vb

@@ -1,10 +1,3 @@
 Public Class ManageLayerExpanderV
 
-   Private Sub LayerTreeView_SelectedItemChanged(sender As Object, e As RoutedPropertyChangedEventArgs(Of Object))
-      If Not IsNothing(LayerTreeView.SelectedItem) Then
-         ' Metti il focus sul TreeView e sul nodo
-         LayerTreeView.Focus()
-      End If
-   End Sub
-
 End Class

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb

@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.Security.Cryptography
 Imports EgtUILib
 
 Public Class ManageLayerExpanderVM
@@ -15,7 +14,7 @@ Public Class ManageLayerExpanderVM
       End Get
       Set(value As String)
          m_HeaderName = value
-         OnPropertyChanged(NameOf(HeaderName))
+         OnPropertyChanged("HeaderName")
       End Set
    End Property
 
@@ -26,26 +25,10 @@ Public Class ManageLayerExpanderVM
       End Get
       Set(value As SolidColorBrush)
          m_HeaderColor = value
-         OnPropertyChanged(NameOf(HeaderColor))
+         OnPropertyChanged("HeaderColor")
       End Set
    End Property
 
-   ' Definizione comandi
-   Private m_cmdNewPart As ICommand
-   Private m_cmdNewLayer As ICommand
-   Private m_cmdLayerColor As ICommand
-   Private m_cmdTreeViewDoubleClick As ICommand
-   Private m_cmdTreeViewMouseUp As ICommand
-   Private m_cmdTreeViewMouseRightButton As ICommand
-   Private m_cmdSelect As ICommand
-   Private m_cmdDeselect As ICommand
-   Private m_cmdName As ICommand
-   Private m_cmdInfo As ICommand
-   Private m_cmdRelocate As ICommand
-   Private m_cmdCopy As ICommand
-   Private m_cmdDelete As ICommand
-   Private m_cmdSave As ICommand
-
    ' Lista dei layer
    Private m_LayerList As New ObservableCollection(Of LayerTreeViewItem)
    Public Property LayerList As ObservableCollection(Of LayerTreeViewItem)
@@ -54,6 +37,7 @@ Public Class ManageLayerExpanderVM
       End Get
       Set(value As ObservableCollection(Of LayerTreeViewItem))
          m_LayerList = value
+         OnPropertyChanged("LayerList")
       End Set
    End Property
 
@@ -71,66 +55,98 @@ Public Class ManageLayerExpanderVM
       End Get
    End Property
 
+   Private m_ManageLayerIsExpanded As Boolean
+   Public Property ManageLayerIsExpanded As Boolean
+      Get
+         Return m_ManageLayerIsExpanded
+      End Get
+      Set(value As Boolean)
+         m_ManageLayerIsExpanded = value
+         Map.refDrawOptionPanelVM.SetManageLayerRowIsExpanded(m_ManageLayerIsExpanded)
+         OnPropertyChanged("ManageLayerIsExpanded")
+      End Set
+   End Property
+   Friend Sub SetManageLayerIsExpanded(value As Boolean)
+      m_ManageLayerIsExpanded = value
+      OnPropertyChanged("ManageLayerIsExpanded")
+   End Sub
+
 #Region "Messages"
 
    Public ReadOnly Property NewPartMsg As String
       Get
-         Return EgtMsg(5352)     ' Nuovo Pezzo
+         Return EgtMsg(MSG_DRAWOPTION + 2)
       End Get
    End Property
    Public ReadOnly Property NewLayerMsg As String
       Get
-         Return EgtMsg(5353)     ' Nuovo Layer
+         Return EgtMsg(MSG_DRAWOPTION + 3)
       End Get
    End Property
    Public ReadOnly Property ColorMsg As String
       Get
-         Return EgtMsg(5354)     ' Colore
+         Return EgtMsg(MSG_DRAWOPTION + 4)
       End Get
    End Property
    Public ReadOnly Property SelectMsg As String
       Get
-         Return EgtMsg(5356)     ' Seleziona
+         Return EgtMsg(MSG_DRAWOPTION + 6)
       End Get
    End Property
    Public ReadOnly Property DeselectMsg As String
       Get
-         Return EgtMsg(5357)     ' Deseleziona
+         Return EgtMsg(MSG_DRAWOPTION + 7)
       End Get
    End Property
    Public ReadOnly Property NameMsg As String
       Get
-         Return EgtMsg(5358)     ' Nome
+         Return EgtMsg(MSG_DRAWOPTION + 8)
       End Get
    End Property
    Public ReadOnly Property InfoMsg As String
       Get
-         Return EgtMsg(5359)     ' Info
+         Return EgtMsg(MSG_DRAWOPTION + 9)
       End Get
    End Property
    Public ReadOnly Property RelocateMsg As String
       Get
-         Return EgtMsg(5360)     ' Sposta
+         Return EgtMsg(MSG_DRAWOPTION + 10)
       End Get
    End Property
    Public ReadOnly Property CopyMsg As String
       Get
-         Return EgtMsg(5361)     ' Copia
+         Return EgtMsg(MSG_DRAWOPTION + 11)
       End Get
    End Property
    Public ReadOnly Property DeleteMsg As String
       Get
-         Return EgtMsg(5362)     ' Elimina
+         Return EgtMsg(MSG_DRAWOPTION + 12)
       End Get
    End Property
    Public ReadOnly Property SaveMsg As String
       Get
-         Return EgtMsg(5363)     ' Salva
+         Return EgtMsg(MSG_DRAWOPTION + 13)
       End Get
    End Property
 
 #End Region
 
+   ' Definizione comandi
+   Private m_cmdNewPart As ICommand
+   Private m_cmdNewLayer As ICommand
+   Private m_cmdLayerColor As ICommand
+   Private m_cmdTreeViewDoubleClick As ICommand
+   Private m_cmdTreeViewMouseUp As ICommand
+   Private m_cmdTreeViewMouseRightButton As ICommand
+   Private m_cmdSelect As ICommand
+   Private m_cmdDeselect As ICommand
+   Private m_cmdName As ICommand
+   Private m_cmdInfo As ICommand
+   Private m_cmdRelocate As ICommand
+   Private m_cmdCopy As ICommand
+   Private m_cmdDelete As ICommand
+   Private m_cmdSave As ICommand
+
 #End Region
 
 #Region "CONSTRUCTOR"
@@ -140,6 +156,7 @@ Public Class ManageLayerExpanderVM
       Map.SetRefManageLayerExpanderVM(Me)
       'Imposto tempo di evidenziazione delle entità clickate
       ObjTreeTimer.Interval = TimeSpan.FromMilliseconds(1000)
+      SetManageLayerIsExpanded(True)
    End Sub
 
 #End Region    ' Constructor
@@ -166,7 +183,7 @@ Public Class ManageLayerExpanderVM
    Public Sub NewPart(ByVal param As Object)
       Map.refProjectVM.ExecuteCommand(Controller.CMD.NEWPART)
       ' Seleziono nell'albero il layer del pezzo appena creato
-      SelectIdInObjTree(EgtGetCurrLayer(), False)
+      SelectIdInObjTreeNoMark(EgtGetCurrLayer())
    End Sub
 
 #End Region ' NewPartCommand
@@ -191,7 +208,7 @@ Public Class ManageLayerExpanderVM
    Public Sub NewLayer(ByVal param As Object)
       Map.refProjectVM.ExecuteCommand(Controller.CMD.NEWLAYER)
       ' Seleziono nell'albero il layer appena creato
-      SelectIdInObjTree(EgtGetCurrLayer(), False)
+      SelectIdInObjTreeNoMark(EgtGetCurrLayer())
    End Sub
 
 #End Region ' NewLayerCommand
@@ -241,6 +258,7 @@ Public Class ManageLayerExpanderVM
       If m_nObjTreeOldId <> GDB_ID.NULL Then
          Map.refProjectVM.SetLastInteger(m_nObjTreeOldId)
          Map.refProjectVM.ExecuteCommand(Controller.CMD.SETCURRPARTLAYER)
+         Map.refDrawOptionPanelVM.SetInfoRowIsExpanded(True)
       End If
    End Sub
 
@@ -480,8 +498,9 @@ Public Class ManageLayerExpanderVM
       ' Se è un pezzo con lavorazioni, devo chiedere conferma della cancellazione
       If EgtIsPart(RightClickedTreeItemId) And EgtExistsInfo(RightClickedTreeItemId, GDB_SI_LIST) Then
          ' Pezzo in lavorazione, vuoi cancellarlo lo stesso ? - Erase Confirm
-         'If MessageBox.Show(EgtMsg(MSG_DRAWOPTION + 17), EgtMsg(MSG_DRAWOPTION + 16), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then Return
-         If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5367), EgtMsg(5366), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then Return  ' Pezzo in lavorazione, vuoi cancellarlo lo stesso ? Conferma Cancellazione
+         If MessageBox.Show(EgtMsg(MSG_DRAWOPTION + 17), EgtMsg(MSG_DRAWOPTION + 16), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then
+            Return
+         End If
       End If
       ' Recupero Id vicino per prossimo selezionato in albero
       Dim nNewId As Integer = EgtGetNext(RightClickedTreeItemId)
@@ -491,7 +510,7 @@ Public Class ManageLayerExpanderVM
       Map.refProjectVM.SetLastInteger(RightClickedTreeItemId)
       Map.refProjectVM.ExecuteCommand(Controller.CMD.DELETE)
       ' Seleziono prossimo
-      SelectIdInObjTree(nNewId, False)
+      SelectIdInObjTreeNoMark(nNewId)
    End Sub
 
 #End Region ' DeleteCommand
@@ -532,11 +551,13 @@ Public Class ManageLayerExpanderVM
    Private m_bEnableUpdateObjInObjTree As Boolean = True
 
    Friend Sub SelectIdInObjTreeNoMark(nId As Integer)
-      SelectIdInObjTree(nId, False)
+      LayerTreeViewItem.m_MarkOnSel = False
+      MySelectIdInObjTree(nId)
+      LayerTreeViewItem.m_MarkOnSel = True
    End Sub
 
    Friend Sub SelectIdInObjTree(nId As Integer)
-      SelectIdInObjTree(nId, True)
+      MySelectIdInObjTree(nId)
    End Sub
 
    Friend Sub UpdateObjTreeOldId(ObjTreeOldId As Integer)
@@ -580,7 +601,7 @@ Public Class ManageLayerExpanderVM
       AddGroupInObjTree(GDB_ID.ROOT, GDB_LV.USER, GDB_MD.STD, 0, LayerList)
       If nOldId <> GDB_ID.NULL Then
          m_bEnableUpdateObjInObjTree = False
-         If Not SelectIdInObjTree(nOldId, True) Then
+         If Not MySelectIdInObjTree(nOldId) Then
             Map.refInfoExpanderVM.SetInfoBox(String.Empty)
          End If
          m_bEnableUpdateObjInObjTree = True
@@ -678,7 +699,7 @@ Public Class ManageLayerExpanderVM
          'se gruppo
          If nType = GDB_TY.GROUP Then
             AddGroupInObjTree(nId, nLevel, nMode, nDepth + 1, CurrNodColl)
-            'se oggetto geometrico
+         'se oggetto geometrico
          ElseIf nType >= GDB_TY.GEO_VECTOR Then
             Dim sTitle As String = String.Empty
             EgtGetTitle(nId, sTitle)
@@ -802,14 +823,11 @@ Public Class ManageLayerExpanderVM
       Return nOldId
    End Function
 
-   Private Function SelectIdInObjTree(nId As Integer, bMark As Boolean) As Boolean
+   Private Function MySelectIdInObjTree(nId As Integer) As Boolean
       Dim tNode As LayerTreeViewItem = SearchIdInLayerList(LayerList, nId, True)
       If Not IsNothing(tNode) Then
-         If Not bMark Then LayerTreeViewItem.m_MarkOnSel = False
          tNode.IsSelected = True
-         tNode.NotifyPropertyChanged(NameOf(tNode.IsSelected))
-         If Not bMark Then LayerTreeViewItem.m_MarkOnSel = True
-         tNode.IsExpanded = True
+         tNode.NotifyPropertyChanged("IsSelected")
          m_nObjTreeOldId = nId
          Return True
       Else

OptionPanel/DrawOptionPanelV.xaml

@@ -1,15 +1,29 @@
 <UserControl x:Class="DrawOptionPanelV"
              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" 
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
 
-   <StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+   <Grid x:Name="DrawGrid" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+      <Grid.RowDefinitions>
+         <RowDefinition MinHeight="100" MaxHeight="800" 
+                        EgtCAM5:DrawOptionPanelVM.RowId="ManageLayer"
+                        EgtCAM5:DrawOptionPanelVM.IsExpanded="{Binding ManageLayerRowIsExpanded}"
+                        EgtCAM5:DrawOptionPanelVM.TargetSplitter="{Binding ElementName=ManagerLayerGridSplitter}"/>
+         <RowDefinition MinHeight="100" MaxHeight="400" 
+                        EgtCAM5:DrawOptionPanelVM.RowId="Info"
+                        EgtCAM5:DrawOptionPanelVM.IsExpanded="{Binding InfoRowIsExpanded}"
+                        EgtCAM5:DrawOptionPanelVM.TargetSplitter="{Binding ElementName=InfoGridSplitter}"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
       <!--ContentPresenter that contains the ManageLayerExpander-->
       <ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
+      <GridSplitter x:Name="ManagerLayerGridSplitter" Style="{StaticResource General_GridSplitter}"/>
       <!--ContentPresenter that contains the InfoExpander-->
-      <ContentPresenter Content="{Binding InfoExpander}"/>
+      <ContentPresenter  Grid.Row="1" Content="{Binding InfoExpander}"/>
+      <GridSplitter x:Name="InfoGridSplitter" Grid.Row="1" Style="{StaticResource General_GridSplitter}"/>
       <!--ContentPresenter that contains the InputExpander-->
-      <ContentPresenter Content="{Binding InputExpander}"/>
-   </StackPanel>
+      <ContentPresenter Grid.Row="2" Content="{Binding InputExpander}"/>
+   </Grid>
 
-</UserControl>
+</UserControl>

OptionPanel/DrawOptionPanelV.xaml.vb

@@ -1,7 +1,30 @@
 Public Class DrawOptionPanelV
 
-   Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
-      Dim x = ciao.MaxHeight
+   Sub New()
+
+      ' This call is required by the designer.
+      InitializeComponent()
+
+      ' Add any initialization after the InitializeComponent() call.
+      Map.SetRefDrawOptionPanelV(Me)
+      If Not IsActivePlugin() Then
+         AddHandler DrawGrid.Loaded,
+            Sub()
+               DynamicGridModule.RestoreDrawGridLayout(DrawGrid, "ManageLayer", 0, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+               DynamicGridModule.RestoreDrawGridLayout(DrawGrid, "Info", 1, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+               DrawGrid.UpdateLayout()
+            End Sub
+
+         AddHandler ManagerLayerGridSplitter.DragCompleted,
+            Sub()
+               DynamicGridModule.SaveDrawGridLayout(DrawGrid, "ManageLayer", If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+            End Sub
+
+         AddHandler InfoGridSplitter.DragCompleted,
+            Sub()
+               DynamicGridModule.SaveDrawGridLayout(DrawGrid, "Info", If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+            End Sub
+      End If
    End Sub
 
 End Class

OptionPanel/DrawOptionPanelVM.vb

@@ -1,16 +1,15 @@
-Public Class DrawOptionPanelVM
-   Inherits ViewModelBase
+Imports System.IO
 
-   Private m_InputExpanderVM As InputExpanderVM
+Public Class DrawOptionPanelVM
+   Inherits ViewModelBase
 
    ' GRAPHICAL ELEMENTS
    Private m_ManageLayerExpander As ManageLayerExpanderV
    Public ReadOnly Property ManageLayerExpander As ContentControl
       Get
          If IsNothing(m_ManageLayerExpander) Then
-            m_ManageLayerExpander = New ManageLayerExpanderV With {
-               .DataContext = New ManageLayerExpanderVM
-            }
+            m_ManageLayerExpander = New ManageLayerExpanderV
+            m_ManageLayerExpander.DataContext = New ManageLayerExpanderVM
          End If
          Return m_ManageLayerExpander
       End Get
@@ -20,9 +19,8 @@
    Public ReadOnly Property InfoExpander As ContentControl
       Get
          If IsNothing(m_InfoExpander) Then
-            m_InfoExpander = New InfoExpanderV With {
-               .DataContext = New InfoExpanderVM
-            }
+            m_InfoExpander = New InfoExpanderV
+            m_InfoExpander.DataContext = New InfoExpanderVM
          End If
          Return m_InfoExpander
       End Get
@@ -32,18 +30,35 @@
    Public ReadOnly Property InputExpander As ContentControl
       Get
          If IsNothing(m_InputExpander) Then
-            'm_InputExpander = New InputExpanderV With {
-            '   .DataContext = New InputExpanderVM
-            '}
-            m_InputExpanderVM = New InputExpanderVM()
-            m_InputExpander = New InputExpanderV With {
-               .DataContext = m_InputExpanderVM
-            }
+            m_InputExpander = New InputExpanderV
+            m_InputExpander.DataContext = New InputExpanderVM
          End If
          Return m_InputExpander
       End Get
    End Property
 
+   Private m_ManageLayerRowIsExpanded As Boolean = True
+   Public ReadOnly Property ManageLayerRowIsExpanded As Boolean
+      Get
+         Return m_ManageLayerRowIsExpanded
+      End Get
+   End Property
+   Friend Sub SetManageLayerRowIsExpanded(value As Boolean)
+      m_ManageLayerRowIsExpanded = value
+      OnPropertyChanged("ManageLayerRowIsExpanded")
+   End Sub
+
+   Private m_InfoRowIsExpanded As Boolean = True
+   Public ReadOnly Property InfoRowIsExpanded As Boolean
+      Get
+         Return m_InfoRowIsExpanded
+      End Get
+   End Property
+   Friend Sub SetInfoRowIsExpanded(value As Boolean)
+      m_InfoRowIsExpanded = value
+      OnPropertyChanged("InfoRowIsExpanded")
+   End Sub
+
 #Region "CONSTRUCTOR"
 
    Sub New()
@@ -56,13 +71,104 @@
 #Region "METHODS"
 
    Friend Function InitDrawOptionPanel() As Boolean
+      'EgtZoom(ZM.ALL)
       Return True
    End Function
 
    Friend Function ExitDrawOptionPanel() As Boolean
+
       Return True
    End Function
 
 #End Region    ' METHODS
 
+#Region "DEPENCY PROPERTY"
+
+   Public Shared ReadOnly RowIdProperty As DependencyProperty =
+        DependencyProperty.RegisterAttached(
+            "RowId",
+            GetType(String),
+            GetType(DrawOptionPanelVM),
+            New PropertyMetadata(Nothing)
+        )
+
+   Public Shared Sub SetRowId(element As DependencyObject, value As String)
+      element.SetValue(RowIdProperty, value)
+   End Sub
+
+   Public Shared Function GetRowId(element As DependencyObject) As String
+      Return CType(element.GetValue(RowIdProperty), String)
+   End Function
+
+   Public Shared ReadOnly IsExpandedProperty As DependencyProperty =
+        DependencyProperty.RegisterAttached(
+            "IsExpanded",
+            GetType(Boolean),
+            GetType(DrawOptionPanelVM),
+            New PropertyMetadata(True, AddressOf OnIsExpandedChanged)
+        )
+
+   Public Shared Sub SetIsExpanded(element As DependencyObject, value As Boolean)
+      element.SetValue(IsExpandedProperty, value)
+   End Sub
+
+   Public Shared Function GetIsExpanded(element As DependencyObject) As Boolean
+      Return CType(element.GetValue(IsExpandedProperty), Boolean)
+   End Function
+
+   Public Shared Function GetTargetSplitter(d As DependencyObject) As GridSplitter
+      Return CType(d.GetValue(TargetSplitterProperty), GridSplitter)
+   End Function
+
+   Public Shared Sub SetTargetSplitter(d As DependencyObject, value As GridSplitter)
+      d.SetValue(TargetSplitterProperty, value)
+   End Sub
+
+   Public Shared ReadOnly TargetSplitterProperty As DependencyProperty =
+        DependencyProperty.RegisterAttached(
+            "TargetSplitter",
+            GetType(GridSplitter),
+            GetType(DrawOptionPanelVM),
+            New PropertyMetadata(Nothing)
+        )
+
+   Private Shared Sub OnIsExpandedChanged(d As DependencyObject, e As DependencyPropertyChangedEventArgs)
+      Dim row As RowDefinition = TryCast(d, RowDefinition)
+      If IsNothing(row) Then Return
+
+      Dim isExpanded As Boolean = CBool(e.NewValue)
+
+      Dim splitter = DrawOptionPanelVM.GetTargetSplitter(row)
+      If splitter IsNot Nothing Then
+         splitter.IsEnabled = isExpanded
+         splitter.Visibility = If(isExpanded, Visibility.Visible, Visibility.Collapsed)
+      End If
+
+      Dim rowId As String = GetRowId(row)
+      Dim rowHeight As Double = 0
+
+      If rowId = "ManageLayer" Then
+         rowHeight = 400
+      ElseIf rowId = "Info" Then
+         rowHeight = 150
+      End If
+
+      If Not isExpanded Then
+         row.ClearValue(RowDefinition.HeightProperty)
+
+         row.Height = New GridLength(1, GridUnitType.Auto)
+         row.MinHeight = 0
+      Else
+         If File.Exists(Map.refMainWindowVM.DimensionDir) Then
+            DynamicGridModule.RestoreDrawGridLayout(Map.refDrawOptionPanelV.DrawGrid, "ManageLayer", 0, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+            DynamicGridModule.RestoreDrawGridLayout(Map.refDrawOptionPanelV.DrawGrid, "Info", 1, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+            Map.refDrawOptionPanelV.DrawGrid.UpdateLayout()
+         Else
+            row.Height = New GridLength(rowHeight)
+         End If
+      End If
+   End Sub
+
+#End Region    ' Depency Property
+
 End Class

OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb

@@ -1,4 +1,5 @@
-Imports System.IO
+Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -17,6 +18,7 @@ Public Class EstimationsExpanderVM
       Set(value As Boolean)
          If value <> m_Estimation_IsExpanded Then
             Map.refMachiningOptionPanelVM.Set_IsExpanded(MachiningOptionPanelVM.MachiningOptionPanelExpander.ESTIMATIONS, value)
+            Map.refMachiningOptionPanelVM.SetOperationsListRowIsExpanded(False)
          End If
       End Set
    End Property
@@ -28,7 +30,7 @@ Public Class EstimationsExpanderVM
       End Get
       Set(value As Boolean)
          m_Estimation_IsEnabled = value
-         NotifyPropertyChanged(NameOf(Estimation_IsEnabled))
+         NotifyPropertyChanged("Estimation_IsEnabled")
       End Set
    End Property
 
@@ -54,8 +56,7 @@ Public Class EstimationsExpanderVM
       ' Verifico che il file esista
       If Not File.Exists(sEstFile) Then
          ' File delle stime non trovato
-         'MessageBox.Show(EgtMsg(MSG_SIMULATION + 18), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5318), EgtMsg(5315), MessageBoxButton.OK, MessageBoxImage.Warning) ' File delle stime non trovato AVVERTIMENTO
+         MessageBox.Show(EgtMsg(MSG_SIMULATION + 18), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning)
          Return
       End If
       ' Visualizzazione
@@ -77,14 +78,14 @@ Public Class EstimationsExpanderVM
       ' Abilito la selezione di tutti i tipi di geometria
       Map.refProjectVM.SceneSelMode = SceneSelModeOpt.PARTCURVESANDSURFACES
       CalcEstimation()
-      NotifyPropertyChanged(NameOf(Time))
-      NotifyPropertyChanged(NameOf(CutLen))
+      NotifyPropertyChanged("Time")
+      NotifyPropertyChanged("CutLen")
 
       m_Estimation_IsExpanded = True
       Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = False
       Map.refOperationsListExpanderVM.EstimationExpander_Get_IsExpanded(True)
-      NotifyPropertyChanged(NameOf(Estimation_IsExpanded))
-      Map.refMachiningOptionPanelVM.OnPropertyChanged(NameOf(Map.refMachiningOptionPanelVM.GenerateIsEnabled))
+      NotifyPropertyChanged("Estimation_IsExpanded")
+      Map.refMachiningOptionPanelVM.OnPropertyChanged("GenerateIsEnabled")
       ' disattivo database utensili, lavorazioni e setup se vado in stima
       Map.refMachinePanelVM.ToolMachSetUpIsEnabled(False, False, False)
       ' disattivo MTable e SpecialPanel se vado in stima
@@ -97,8 +98,8 @@ Public Class EstimationsExpanderVM
       m_Estimation_IsExpanded = False
       Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = True
       Map.refOperationsListExpanderVM.EstimationExpander_Get_IsExpanded(False)
-      NotifyPropertyChanged(NameOf(Estimation_IsExpanded))
-      Map.refMachiningOptionPanelVM.OnPropertyChanged(NameOf(Map.refMachiningOptionPanelVM.GenerateIsEnabled))
+      NotifyPropertyChanged("Estimation_IsExpanded")
+      Map.refMachiningOptionPanelVM.OnPropertyChanged("GenerateIsEnabled")
       ' attivo database utensili, lavorazioni e setup se esco dalla stima
       Map.refMachinePanelVM.ToolMachSetUpIsEnabled(True, True, True)
       ' attivo MTable e SpecialPanel se esco dalla stima
@@ -115,8 +116,7 @@ Public Class EstimationsExpanderVM
       If bAskSave Then
          If String.IsNullOrEmpty(sCurrFilePath) OrElse EgtGetModified() Then
             ' Il progetto deve essere salvato prima di poter essere generato. Vuoi farlo ?
-            'If MessageBox.Show(EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
-            If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5331), EgtMsg(5315), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then ' Il progetto deve essere salvato prima della generazione CN. Vuoi farlo ? AVVERTIMENTO
+            If MessageBox.Show(EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
                ' Abbandono
                bOk = False
             Else
@@ -131,8 +131,7 @@ Public Class EstimationsExpanderVM
       Else
          If String.IsNullOrEmpty(sCurrFilePath) Then
             ' File delle stime non trovato
-            'MessageBox.Show(EgtMsg(MSG_SIMULATION + 18), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5318), EgtMsg(5315), MessageBoxButton.OK, MessageBoxImage.Warning) ' File delle stime non trovato AVVERTIMENTO
+            MessageBox.Show(EgtMsg(MSG_SIMULATION + 18), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning)
             bOk = False
          End If
       End If
@@ -140,7 +139,7 @@ Public Class EstimationsExpanderVM
       If Not String.IsNullOrEmpty(sCurrFilePath) Then
          sInfo = "EgtCAM5 - " & sCurrFilePath
          If EgtGetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_NCNAME, sEstFile) AndAlso Not String.IsNullOrWhiteSpace(sEstFile) Then
-            sEstFile = Path.ChangeExtension(Path.GetDirectoryName(sCurrFilePath) & "\" & sEstFile, ".html")
+            sEstFile = Path.ChangeExtension(Path.GetDirectoryName(sCurrFilePath) & "\" & Path.GetFileName( sEstFile), ".html")
          Else
             sEstFile = Path.ChangeExtension(sCurrFilePath, Nothing)
             If IniFile.m_bMachiningGroup Then

OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml

@@ -1,7 +1,9 @@
 <UserControl x:Class="EstimationsExpanderV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+   
    <StackPanel>
 
       <Expander Header="{Binding EstimationMsg}"

OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderV.xaml

@@ -1,13 +1,19 @@
 <UserControl x:Class="MachiningTreeExpanderV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:EgtCAM5">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+   xmlns:local="clr-namespace:EgtCAM5">
 
    <Expander Header="{Binding MachListHdr}" IsExpanded="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}"
-             Style="{StaticResource ExpanderStyle}">
+      Style="{StaticResource ExpanderStyle}">
       <UniformGrid MaxHeight="300">
          <TreeView Name="MachiningsTreeView" Grid.Row="1"
             ItemsSource="{Binding Path=MachiningsList}">
+            <!--<interactivity:Interaction.Triggers>
+               <interactivity:EventTrigger EventName="MouseDoubleClick">
+                  <interactivity:InvokeCommandAction Command="{Binding TreeViewDoubleClickCommand}" CommandParameter="{Binding ElementName=MachiningsTreeView,Path=SelectedItem}"/>
+               </interactivity:EventTrigger>
+            </interactivity:Interaction.Triggers>-->
             <TreeView.InputBindings>
                <KeyBinding Key="Escape" Command="{Binding CancelNewCommand}" CommandParameter="Escape"/>
             </TreeView.InputBindings>
@@ -28,7 +34,7 @@
                   </Grid>
 
                   <!--Assegna ai nodi ToolItem lo Style normale dei TreeViewItem, eliminando l'ombra, data dal 
-                      multibinding quando sono attivi.-->
+                   multibinding quando sono attivi.-->
                   <HierarchicalDataTemplate.ItemContainerStyle>
                      <Style TargetType="{x:Type TreeViewItem}" >
                         <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderV.xaml.vb

@@ -2,6 +2,12 @@
 
    ' Evento necessario per impedire che venga creata la lavorazione quando si fa doppio click sulla ScrollBar
    Private Sub MachiningsTreeView_MouseDoubleClick(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
+      'Dim src As DependencyObject = VisualTreeHelper.GetParent(DirectCast(e.OriginalSource, DependencyObject))
+
+      '' Your logic here
+      'If TypeOf src Is Control AndAlso src.[GetType]() <> GetType(Grid) Then
+      '   e.Handled = True
+      'End If
       ' recupero il viewmodel associato a questa view in cui è presente la funzione che l'evento deve lanciare
       Dim MachiningTreeExpanderViewModel As MachiningTreeExpanderVM = DirectCast(Me.DataContext, MachiningTreeExpanderVM)
       ' recupero il treeviewitem clickato(sorgente dell'evento)

OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb

@@ -36,7 +36,7 @@ Public Class MachiningTreeExpanderVM
 
    Public ReadOnly Property MachListHdr As String
       Get
-         Return EgtMsg(5412)     ' Nuove Lavorazioni
+         Return EgtMsg(MSG_OPERATION + 12)                      ' Nuove Lavorazioni
       End Get
    End Property
 
@@ -85,8 +85,7 @@ Public Class MachiningTreeExpanderVM
          ' Se l'operazione non è andata a buon fine
          If MachiningId = GDB_ID.NULL Then
             ' Inserimento lavorazione non riuscito    ERRORE
-            'MessageBox.Show(EgtMsg(MSG_OPERATION + 19), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5419), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Inserimento lavorazione non riuscito Errore
+            MessageBox.Show(EgtMsg(MSG_OPERATION + 19), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
             Map.refOperationsListExpanderVM.CancelOperationCmd()
             Return
          End If
@@ -95,26 +94,18 @@ Public Class MachiningTreeExpanderVM
             ' Sposto la lavorazione aggiunta subito dopo quella appena selezionata
             EgtRelocate(MachiningId, nSelectedOperationId, GDB_POS.AFTER)
          End If
-         ' Recupero geometria correntemente selezionata e la metto in un vettore
-         Dim SelectedEntities As New List(Of Integer)
-         Dim EntityId As Integer = EgtGetFirstSelectedObj()
-         While EntityId <> GDB_ID.NULL
-            SelectedEntities.Add(EntityId)
-            EntityId = EgtGetNextSelectedObj()
+         ' Imposto geometria da lavorare (tutta quella selezionata)
+         Dim vId(EgtGetSelectedObjCount() - 1) As Integer
+         Dim vSub(EgtGetSelectedObjCount() - 1) As Integer
+         Dim nInd As Integer = 0
+         Dim EntId As Integer = EgtGetFirstSelectedObj()
+         While EntId <> GDB_ID.NULL
+            vId(nInd) = EntId
+            SelData.GetSubFromId( EntId, vSub(nInd))
+            nInd += 1
+            EntId = EgtGetNextSelectedObj()
          End While
-         ' Imposto l'operazione appena creata come corrente
-         EgtSetCurrMachining(MachiningId)
-         ' Gestione speciale per superfici ( si aggiunge l'identificazione della faccia)
-         If SelectedEntities.Count() > 0 AndAlso EgtGetType(SelectedEntities(0)) = GDB_TY.SRF_MESH Then
-            Dim vId() As Integer = Nothing
-            Dim vSub() As Integer = Nothing
-            SelData.GetAllIdSub(vId, vSub)
-            EgtSetMachiningGeometry(vId, vSub)
-         ' Gestione standard per altre entità (curve, regioni, ...)
-         Else
-            ' Imposto il vettore come geometria di lavorazione
-            EgtSetMachiningGeometry(SelectedEntities.ToArray)
-         End If
+         EgtSetMachiningGeometry(vId, vSub)
          ' Calcolo la lavorazione con la nuova geometria
          EgtApplyMachining(True)
          EgtDraw()
@@ -128,31 +119,33 @@ Public Class MachiningTreeExpanderVM
    Private Function MachiningTypeToString(Type As Integer) As String
       Select Case Type
          Case MCH_MY.DRILLING
-            Return EgtMsg(6201)     ' Foratura
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 1)
          Case MCH_MY.SAWING
-            Return EgtMsg(6202)     ' Taglio di lama
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 2)
          Case MCH_MY.MILLING
-            Return EgtMsg(6203)     ' Fresatura
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 3)
          Case MCH_MY.POCKETING
-            Return EgtMsg(6204)     ' Svuotatura
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 4)
          Case MCH_MY.MORTISING
-            Return EgtMsg(6205)     ' Mortasatura
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 5)
          Case MCH_MY.SAWROUGHING
-            Return EgtMsg(6206)     ' Sgrossatura con lama
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 6)
          Case MCH_MY.SAWFINISHING
-            Return EgtMsg(6207)     ' Finitura con lama
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 7)
          Case MCH_MY.GENMACHINING
-            Return EgtMsg(6208)     ' Lav. generica
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 8)
          Case MCH_MY.CHISELING
-            Return EgtMsg(6209)     ' Scalpellatura
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 9)
          Case MCH_MY.SURFROUGHING
-            Return EgtMsg(6210)     ' Sgrossatura superfici
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 10)
          Case MCH_MY.SURFFINISHING
-            Return EgtMsg(6211)     ' Finitura superfici
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 11)
          Case MCH_MY.WATERJETTING
-            Return EgtMsg(6212)     ' WaterJet
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 12)
          Case MCH_MY.FIVEAXISMILLING
-            Return EgtMsg(31213)    ' Lav. 5 assi
+            Return EgtMsg(31213)
+         Case MCH_MY.PROBING
+            Return EgtMsg(31220)
          Case Else
             Return "Mach"
       End Select
@@ -200,7 +193,7 @@ Public Class MachiningTreeExpanderVM
       Map.refProjectVM.SceneSelMode = SceneSelModeOpt.ALL
 
       CodeCommand = False
-      OnPropertyChanged(NameOf(IsEnabled))
+      OnPropertyChanged("IsEnabled")
       Return True
    End Function
 
@@ -214,11 +207,11 @@ Public Class MachiningTreeExpanderVM
       If Not CodeCommand Then
          Map.refOperationsListExpanderVM.CancelOperationCmd()
          CodeCommand = False
-         OnPropertyChanged(NameOf(IsEnabled))
+         OnPropertyChanged("IsEnabled")
          Return False
       End If
       CodeCommand = False
-      OnPropertyChanged(NameOf(IsEnabled))
+      OnPropertyChanged("IsEnabled")
       Return True
    End Function
 

OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeViewExpander.vb

@@ -63,6 +63,7 @@ Public Class MachiningTreeViewExpanderItem
 
 End Class
 
+
 ''' <summary>
 ''' Class that represent a FamilyMachining in the treeview.
 ''' It's an element in the treeview that represent a folder, but also a machining family

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderV.xaml

@@ -1,7 +1,7 @@
 <UserControl x:Class="DispositionParameterExpanderV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:sys="clr-namespace:System;assembly=mscorlib">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
    <UserControl.Resources>
       <sys:Int32 x:Key="TL">1</sys:Int32>
@@ -13,28 +13,28 @@
    <StackPanel>
 
       <Expander Header="RawPart" IsExpanded="{Binding RawPartIsExpanded}"
-                Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+         Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
          <StackPanel>
             <ContentPresenter Name="RawPartOptions" Content="{Binding RawPartOptions ,Mode=OneWay}"/>
          </StackPanel>
       </Expander>
 
       <Expander Header="Part" IsExpanded="{Binding PartIsExpanded}"
-                Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+         Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
          
       </Expander>
 
       <Expander Header="Fixture" IsExpanded="{Binding FixtureIsExpanded}"
-                Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+         Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
          <!--ContentPresenter that contains the Fixture options -->
          <ContentPresenter Name="FixtureParameters" Content="{Binding FixtureParameters ,Mode=OneWay}"/>
       </Expander>
 
       <UniformGrid Columns="2">
          <RadioButton Content="Move" IsChecked="{Binding MoveIsChecked}"
-                      Style="{StaticResource {x:Type ToggleButton}}" Height="30"/>
+            Style="{StaticResource {x:Type ToggleButton}}" Height="30"/>
          <RadioButton Content="Rotate"
-                      Style="{StaticResource {x:Type ToggleButton}}" Height="30"/>
+            Style="{StaticResource {x:Type ToggleButton}}" Height="30"/>
       </UniformGrid>
 
       <Grid Margin="0,5,0,5" Visibility="{Binding RawRefGroupVisibility}">
@@ -52,28 +52,28 @@
 
          <TextBlock Grid.ColumnSpan="4" Text="Move Raw Reference"/>
          <RadioButton Grid.Column="1" Grid.Row="1" Command="{Binding CheckedRawRefCommand}"
-                      CommandParameter="{StaticResource TL}"
-                      Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
+            CommandParameter="{StaticResource TL}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
             <Border BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="5,5,0,0"
-                    Height="30" Width="30"/>
+               Height="30" Width="30"/>
          </RadioButton>
          <RadioButton Grid.Column="2" Grid.Row="1" Command="{Binding CheckedRawRefCommand}"
-                      CommandParameter="{StaticResource TR}"
-                      Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
+            CommandParameter="{StaticResource TR}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
             <Border BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="0,5,5,0"
-                    Height="30" Width="30"/>
+               Height="30" Width="30"/>
          </RadioButton>
          <RadioButton Grid.Column="1" Grid.Row="2" Command="{Binding CheckedRawRefCommand}"
-                      CommandParameter="{StaticResource BL}" IsChecked="{Binding BLIsChecked,Mode=OneWay}"
-                      Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
+            CommandParameter="{StaticResource BL}" IsChecked="{Binding BLIsChecked,Mode=OneWay}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
             <Border BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="5,0,0,5"
-                    Height="30" Width="30"/>
+               Height="30" Width="30"/>
          </RadioButton>
          <RadioButton Grid.Column="2" Grid.Row="2" Command="{Binding CheckedRawRefCommand}"
-                      CommandParameter="{StaticResource BR}"
-                      Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
+            CommandParameter="{StaticResource BR}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
             <Border BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="0,0,5,5"
-                    Height="30" Width="30"/>
+               Height="30" Width="30"/>
          </RadioButton>
 
       </Grid>
@@ -82,18 +82,21 @@
       <TextBox Text="{Binding InputValue,UpdateSourceTrigger=PropertyChanged}" Margin="5,0,5,5">
          <TextBox.InputBindings>
             <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
+            <!--<KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>-->
          </TextBox.InputBindings>
       </TextBox>
       <TextBlock Text="{Binding InputErrorMsg,Mode=OneWay}" Margin="5,5,5,5"
-                 Style="{StaticResource ValidationErrorTextBlock}"/>
+         Style="{StaticResource ValidationErrorTextBlock}"/>
 
       <Grid Margin="5,0,5,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
+         <!--<Button Command="{Binding ShowCommand}" Visibility="{Binding ShowBtnVisibility}"
+               Content="{Binding ShowMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>-->
          <Button Command="{Binding DoneCommand}" Grid.Column="1"
-                 Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
+               Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
       </Grid>
 
    </StackPanel>

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb

@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.ComponentModel
+Imports System.Globalization
+Imports EgtUILib
 
 Public Class DispositionParameterExpanderVM
    Inherits ViewModelBase
@@ -68,12 +70,12 @@ Public Class DispositionParameterExpanderVM
                End If
                If m_MoveIsChecked Then
                   m_RawRefGroupVisibility = Visibility.Visible
-                  OnPropertyChanged(NameOf(RawRefGroupVisibility))
+                  OnPropertyChanged("RawRefGroupVisibility")
                End If
             Else
                ' Nascondo i bottoni per impostare la posizione di riferimento del grezzo
                m_RawRefGroupVisibility = Visibility.Collapsed
-               OnPropertyChanged(NameOf(RawRefGroupVisibility))
+               OnPropertyChanged("RawRefGroupVisibility")
                ' smarco la prima entità selezionata
                EgtResetMark(EgtGetFirstSelectedObj)
                EgtDeselectAll()
@@ -81,7 +83,7 @@ Public Class DispositionParameterExpanderVM
             End If
             m_RawPartIsExpanded = value
             ActiveObject = ObjectType.RAWPART
-            OnPropertyChanged(NameOf(RawPartIsExpanded))
+            OnPropertyChanged("RawPartIsExpanded")
          End If
       End Set
    End Property
@@ -105,7 +107,7 @@ Public Class DispositionParameterExpanderVM
             End If
             m_PartIsExpanded = value
             ActiveObject = ObjectType.PART
-            OnPropertyChanged(NameOf(PartIsExpanded))
+            OnPropertyChanged("PartIsExpanded")
          End If
       End Set
    End Property
@@ -133,7 +135,7 @@ Public Class DispositionParameterExpanderVM
             End If
             m_FixtureIsExpanded = value
             ActiveObject = ObjectType.FIXTURE
-            OnPropertyChanged(NameOf(FixtureIsExpanded))
+            OnPropertyChanged("FixtureIsExpanded")
          End If
       End Set
    End Property
@@ -147,22 +149,22 @@ Public Class DispositionParameterExpanderVM
          If value <> m_MoveIsChecked Then
             Map.refProjectVM.SetMoveInDisposition(value)
             InputValue = String.Empty
-            OnPropertyChanged(NameOf(InputValue))
+            OnPropertyChanged("InputValue")
             If value Then
                If m_RawPartIsExpanded Then
                   m_RawRefGroupVisibility = Visibility.Visible
-                  OnPropertyChanged(NameOf(RawRefGroupVisibility))
+                  OnPropertyChanged("RawRefGroupVisibility")
                Else
                   m_RawRefGroupVisibility = Visibility.Collapsed
-                  OnPropertyChanged(NameOf(RawRefGroupVisibility))
+                  OnPropertyChanged("RawRefGroupVisibility")
                End If
                m_InputMsg = "Move to:"
             Else
                m_RawRefGroupVisibility = Visibility.Collapsed
-               OnPropertyChanged(NameOf(RawRefGroupVisibility))
+               OnPropertyChanged("RawRefGroupVisibility")
                m_InputMsg = "Rotate of:"
             End If
-            OnPropertyChanged(NameOf(InputMsg))
+            OnPropertyChanged("InputMsg")
             m_MoveIsChecked = value
          End If
       End Set
@@ -176,7 +178,7 @@ Public Class DispositionParameterExpanderVM
       Set(value As String)
          If Not String.IsNullOrEmpty(m_InputErrorMsg) Then
             m_InputErrorMsg = String.Empty
-            OnPropertyChanged(NameOf(InputErrorMsg))
+            OnPropertyChanged("InputErrorMsg")
          End If
          m_InputValue = value
       End Set
@@ -205,9 +207,8 @@ Public Class DispositionParameterExpanderVM
    Public ReadOnly Property FixtureParameters As ContentControl
       Get
          If IsNothing(m_FixtureParameters) Then
-            m_FixtureParameters = New FixtureParametersV With {
-               .DataContext = New FixtureParametersVM(m_ExpandFixtureFunction)
-            }
+            m_FixtureParameters = New FixtureParametersV
+            m_FixtureParameters.DataContext = New FixtureParametersVM(m_ExpandFixtureFunction)
          End If
          Return m_FixtureParameters
       End Get
@@ -217,9 +218,8 @@ Public Class DispositionParameterExpanderVM
    Public ReadOnly Property RawPartOptions As ContentControl
       Get
          If IsNothing(m_RawPartOptions) Then
-            m_RawPartOptions = New RawPartOptionV With {
-               .DataContext = New RawPartOptionVM
-            }
+            m_RawPartOptions = New RawPartOptionV
+            m_RawPartOptions.DataContext = New RawPartOptionVM
          End If
          Return m_RawPartOptions
       End Get
@@ -243,7 +243,7 @@ Public Class DispositionParameterExpanderVM
 
    Public ReadOnly Property OkMsg As String
       Get
-         Return EgtMsg(5431)     ' Ok
+         Return EgtMsg(MSG_DISPOSITION + 1)
       End Get
    End Property
 
@@ -259,7 +259,7 @@ Public Class DispositionParameterExpanderVM
       OpenDispositionFunction = AddressOf OpenDispositionParameters
       MoveIsChecked = True
       m_BLIsChecked = True
-      OnPropertyChanged(NameOf(BLIsChecked))
+      OnPropertyChanged("BLIsChecked")
       m_RawRefPosition = MCH_CR.BL
    End Sub
 
@@ -313,13 +313,17 @@ Public Class DispositionParameterExpanderVM
          ' se movimento di traslazione
          If m_MoveIsChecked Then
             Dim InputPoint As New Point3d(0, 0, 0)
+            Dim dSupp As Double = -1
             Dim Values() As String = m_InputValue.Split(","c)
-            If Values.Count = 2 Then
+            If Values.Count >= 2 Then
                StringToLen(Values(0), InputPoint.x)
                StringToLen(Values(1), InputPoint.y)
+               If Values.Count >= 3 Then
+                  StringToLen(Values(2), dSupp)
+               End If
             Else
-               m_InputErrorMsg = "Il valore non è una cordinata XY"
-               OnPropertyChanged(NameOf(InputErrorMsg))
+               m_InputErrorMsg = "Il valore non è un punto X,Y"
+               OnPropertyChanged("InputErrorMsg")
                Return
             End If
             ' Vettore di movimento
@@ -331,13 +335,44 @@ Public Class DispositionParameterExpanderVM
                ' imposto il riferimento della tavola
                Dim ptTableRef As Point3d
                EgtGetTableRef(1, ptTableRef)
-               ' calcolo il punto del grezzo da posizionar nelle coordinate di input
+               ' calcolo il punto del grezzo da posizionare nelle coordinate di input
                Dim ptRawRefPoint As Point3d = DispositionUtility.GetRawPartRefPoint(nFirstSelectedId, m_RawRefPosition)
                ' creo un punto con le coordinate di input espresse rispetto alla tavola
                Dim TableRefInputPoint As New Point3d(InputPoint)
                TableRefInputPoint.LocToLoc(EgtGetGridFrame(), New Frame3d(ptTableRef))
                ' calcolo il vettore di spostamento del grezzo
                vtMove = TableRefInputPoint - ptRawRefPoint
+               vtMove.z = 0
+               ' verifico ed aggiusto eventuale supporto
+               Dim dOldSupp As Double = 0
+               Dim nOldSuppId As Integer = EgtGetFirstNameInGroup(nFirstSelectedId, SUPPORT)
+               If nOldSuppId <> GDB_ID.NULL Then
+                  Dim bboxSupport As New BBox3d
+                  EgtGetBBoxGlob(nOldSuppId, GDB_BB.STANDARD, bboxSupport)
+                  dOldSupp = bboxSupport.DimZ()
+               End If
+               If dSupp > -EPS_SMALL AndAlso Math.Abs( dSupp - dOldSupp) > EPS_SMALL Then
+                  ' da cancellare
+                  If dSupp < EPS_SMALL Then
+                     EgtErase( nOldSuppId)
+                     vtMove.z = dSupp - dOldSupp
+                  ' da creare o modificare
+                  Else
+                     EgtErase( nOldSuppId)
+                     Dim nNewSuppId As Integer = GDB_ID.NULL
+                     Dim nRawOutLnId As Integer = EgtGetFirstNameInGroup(nFirstSelectedId, RAWOUTLINE)
+                     If nRawOutLnId <> GDB_ID.NULL Then
+                        Dim vtExtr As New Vector3d( 0, 0, -dSupp)
+                        nNewSuppId = EgtCreateSurfTmByRegionExtrusion( nFirstSelectedId, 1, {nRawOutLnId}, vtExtr, 0.05, GDB_RT.GLOB)
+                     End If
+                     If nNewSuppId <> GDB_ID.NULL Then
+                        EgtSetName( nNewSuppId, SUPPORT)
+                        EgtSetColor( nNewSuppId, New Color3d(150, 75, 0))
+                        If nOldSuppId <> GDB_ID.NULL Then EgtChangeId( nNewSuppId, nOldSuppId)
+                        vtMove.z = dSupp - dOldSupp
+                     End If
+                  End If
+               End If
             ' se è una ventosa
             ElseIf EgtVerifyFixture(nFirstSelectedId) Then
                Dim SelObjFrame3d As New Frame3d(Frame3d.GLOB)
@@ -386,7 +421,7 @@ Public Class DispositionParameterExpanderVM
             Dim InputAngle As Double = 0
             If Not StringToDouble(sVal, InputAngle) Then
                m_InputErrorMsg = "Il valore non è un angolo valido"
-               OnPropertyChanged(NameOf(InputErrorMsg))
+               OnPropertyChanged("InputErrorMsg")
                Return
             End If
             ' eseguo rotazione
@@ -399,14 +434,14 @@ Public Class DispositionParameterExpanderVM
                         DispositionUtility.VerifyRawPosition(nSelId, vtOrigMove, vtRefMove)
                      Else
                         m_InputErrorMsg = "Impossibile ruotare il grezzo."
-                        OnPropertyChanged(NameOf(InputErrorMsg))
+                        OnPropertyChanged("InputErrorMsg")
                      End If
                   Case ObjectType.PART
                      'EgtMove...
                   Case ObjectType.FIXTURE
                      If Not EgtRotateFixture(nSelId, InputAngle) Then
                         m_InputErrorMsg = "Impossibile ruotare la ventosa"
-                        OnPropertyChanged(NameOf(InputErrorMsg))
+                        OnPropertyChanged("InputErrorMsg")
                      End If
                End Select
                nSelId = EgtGetNextSelectedObj()
@@ -436,8 +471,24 @@ Public Class DispositionParameterExpanderVM
    ''' Execute the Point.  This method is invoked by the DoneCommand.
    ''' </summary>
    Public Sub CheckedRawRef(ByVal param As Object)
+      ' Assegno corner di riferimento
       Dim nRawRef As MCH_CR = DirectCast(param, MCH_CR)
       m_RawRefPosition = nRawRef
+      ' Se grezzo selezionato, visualizzo sua posizione
+      Dim nFirstSelectedId As Integer = EgtGetFirstSelectedObj()
+      If EgtVerifyRawPartCurrPhase(nFirstSelectedId) Then
+         Dim ptR As Point3d = DispositionUtility.GetRawPartRefPoint(nFirstSelectedId, m_RawRefPosition)
+         Dim sSupp As String = ""
+         Dim nSuppId As Integer = EgtGetFirstNameInGroup(nFirstSelectedId, SUPPORT)
+         If nSuppId <> GDB_ID.NULL Then
+            Dim bboxSupport As New BBox3d
+            EgtGetBBoxGlob(nSuppId, GDB_BB.STANDARD, bboxSupport)
+            Dim dSupp As Double = bboxSupport.DimZ()
+            sSupp = "," & LenToString( dSupp, 2)
+         End If
+         m_InputValue = LenToString( ptR.x, 2) & "," & LenToString( ptR.y, 2) & sSupp
+         OnPropertyChanged( "InputValue")
+End If
    End Sub
 
 #End Region ' CheckedRawRefCommand

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb

@@ -1,5 +1,4 @@
-Imports System.Windows.Forms.AxHost
-Imports EgtUILib
+Imports EgtUILib
 Imports Microsoft.VisualBasic.ApplicationServices
 
 Public NotInheritable Class DispositionUtility
@@ -214,6 +213,10 @@ Public NotInheritable Class DispositionUtility
             If Not VerifyRawPartFixturePos(nMoveId, vtMove, vtRefMove) Then
                bErrorVerify = True
             End If
+            'Dim sOut As String = "VerifyRaw : Count=" & nCount & " Err=" & If(bErrorVerify, "1", "0") &
+            '                              " Move=" & LenToString(vtMove.x, 3) & "," & LenToString(vtMove.y, 3) &
+            '                              " RefMove=" & LenToString(vtRefMove.x, 3) & "," & LenToString(vtRefMove.y, 3)
+            'EgtOutLog(sOut)
          End If
       End If
       ' Se non c'è errore ma necessaria correzione riferimento
@@ -319,11 +322,11 @@ Public NotInheritable Class DispositionUtility
                      Dim dFixtureHeight As Double = 0
                      EgtGetInfo(nFixtureId, "H", dFixtureHeight)
                      ' recupero altezza grezzo riferita alla tavola
-                     Dim dRawPartMin As Point3d = bboxRawPart.Min
-                     dRawPartMin.ToLoc(TableFrame)
+                     Dim ptRawPartMin As Point3d = bboxRawPart.Min
+                     ptRawPartMin.ToLoc(TableFrame)
                      ' se l'altezza grezzo è minore di quella della ventosa, lo sposto alla stessa altezza
-                     If dRawPartMin.z < dFixtureHeight - EPS_SMALL Then
-                        Dim vtMove As New Vector3d(0, 0, dFixtureHeight - dRawPartMin.z)
+                     If ptRawPartMin.z < dFixtureHeight - EPS_SMALL Then
+                        Dim vtMove As New Vector3d(0, 0, dFixtureHeight - ptRawPartMin.z)
                         EgtMoveRawPart(nRawPartId, vtMove)
                         ' ricalcolo il BBox del solido del grezzo per averlo aggiornato con la nuova Z
                         EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPart)
@@ -355,19 +358,19 @@ Public NotInheritable Class DispositionUtility
                         nOtherFixtureId = EgtGetNextFixture(nOtherFixtureId)
                      End While
                      ' recupero altezza grezzo riferita alla tavola
-                     Dim dRawPartMin As Point3d = bboxRawPart.Min
-                     dRawPartMin.ToLoc(TableFrame)
+                     Dim ptRawPartMin As Point3d = bboxRawPart.Min
+                     ptRawPartMin.ToLoc(TableFrame)
                      ' se non ci sono ventose sotto il grezzo
                      If Not bIsFixtureUnderRawPart Then
                         ' verifico che il grezzo sia ad altezza tavola
-                        If dRawPartMin.z <> 0 Then
-                           Dim vtMove As New Vector3d(0, 0, -dRawPartMin.z)
+                        If ptRawPartMin.z <> 0 Then
+                           Dim vtMove As New Vector3d(0, 0, -ptRawPartMin.z)
                            EgtMoveRawPart(nRawPartId, vtMove)
                         End If
                      Else
                         ' se ci sono verifico che l'altezza del grezzo sia quella della ventosa più alta
-                        If Math.Abs(dRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
-                           Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - dRawPartMin.z)
+                        If Math.Abs(ptRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
+                           Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - ptRawPartMin.z)
                            EgtMoveRawPart(nRawPartId, vtMove)
                         End If
                      End If
@@ -469,23 +472,30 @@ Public NotInheritable Class DispositionUtility
       ' Recupero il solido del grezzo
       Dim nMovedRawSolidId As Integer = EgtGetFirstNameInGroup(nRawId, RAWSOLID)
       ' definisco il box del solido del grezzo
-      Dim bboxRawPartId As New BBox3d
-      EgtGetBBoxGlob(nMovedRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPartId)
+      Dim bboxRawPart As New BBox3d
+      EgtGetBBoxGlob(nMovedRawSolidId, GDB_BB.STANDARD, bboxRawPart)
+      ' aggiungo il box dell'eventuale supporto o sottopezzo
+      Dim nSupportId As Integer = EgtGetFirstNameInGroup(nRawId, SUPPORT)
+      If nSupportId <> GDB_ID.NULL Then
+         Dim bboxSupport As New BBox3d
+         EgtGetBBoxGlob(nSupportId, GDB_BB.STANDARD, bboxSupport)
+         bboxRawPart.Add( bboxSupport)
+      End If
       ' Variabile che dice se c'è almeno una ventosa sotto il grezzo
       Dim bIsFixtureUnderRawPart As Boolean = False
       Dim bboxFixture As New BBox3d
       ' variabile che contiene la massima altezza delle ventose sottostanti
       Dim dMaxFixtureHeight As Double = 0
       ' recupero altezza grezzo riferita alla tavola
-      Dim dRawPartMin As Point3d = bboxRawPartId.Min
-      dRawPartMin.ToLoc(TableFrame)
+      Dim ptRawPartMin As Point3d = bboxRawPart.Min
+      ptRawPartMin.ToLoc(TableFrame)
       ' Ciclo sui sottopezzi presenti per verificare le collisioni con il grezzo
       Dim nFixtureId As Integer = EgtGetFirstFixture()
       While nFixtureId <> GDB_ID.NULL
          ' calcolo il BBox del sottopezzo
          EgtGetBBoxGlob(nFixtureId, GDB_BB.ONLY_VISIBLE, bboxFixture)
          ' verifico se c'è sovrapposizione
-         If bboxRawPartId.OverlapsXY(bboxFixture) Then 
+         If bboxRawPart.OverlapsXY(bboxFixture) Then 
             ' recupero il tipo di fixture         
             Dim nFxtType As FIX_TYPE = FixtureType(nFixtureId)
             ' Se è ventosa o morsa
@@ -498,22 +508,22 @@ Public NotInheritable Class DispositionUtility
                   dMaxFixtureHeight = dFixtureHeight
                End If
                ' se l'altezza grezzo è diversa da quella della ventosa, lo sposto alla stessa altezza
-               If dRawPartMin.z < dFixtureHeight - EPS_SMALL Then
-                  Dim vtMove As New Vector3d(0, 0, dFixtureHeight - dRawPartMin.z)
+               If ptRawPartMin.z < dFixtureHeight - EPS_SMALL Then
+                  Dim vtMove As New Vector3d(0, 0, dFixtureHeight - ptRawPartMin.z)
                   EgtMoveRawPart(nRawId, vtMove)
                   ' recupero il solido del grezzo
                   Dim nRawSolidId As Integer = EgtGetFirstNameInGroup(nRawId, RAWSOLID)
                   ' ricalcolo il BBox del solido del grezzo per averlo aggiornato con la nuova Z
-                  EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPartId)
-                  dRawPartMin = bboxRawPartId.Min
-                  dRawPartMin.ToLoc(TableFrame)
+                  EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPart)
+                  ptRawPartMin = bboxRawPart.Min
+                  ptRawPartMin.ToLoc(TableFrame)
                End If
                bIsFixtureUnderRawPart = True
             End If
             ' Se è morsa
             If nFxtType = FIX_TYPE.VISE Then
                ' regolo la posizione in Z della morsa
-               EgtSetFixtureMobile( nFixtureId, bboxRawPartId.DimZ())
+               EgtSetFixtureMobile( nFixtureId, bboxRawPart.DimZ())
             End If
             ' Se è un riferimento o una morsa
             If nFxtType = FIX_TYPE.REFERENCE Or nFxtType = FIX_TYPE.VISE Then
@@ -522,7 +532,7 @@ Public NotInheritable Class DispositionUtility
                ' calcolo bbox dell'arco di riferimento
                Dim bboxArcRef As New BBox3d
                EgtGetBBoxGlob(arcRefId, GDB_BB.STANDARD, bboxArcRef)
-               If bboxRawPartId.OverlapsXY(bboxArcRef) Then
+               If bboxRawPart.OverlapsXY(bboxArcRef) Then
                   ' recupero contorno del grezzo
                   Dim ccompoRawPartOutlineId As Integer = EgtGetFirstNameInGroup(nRawId, RAWOUTLINE)
                   'recupero il raggio dell'arco di riferimento
@@ -584,14 +594,14 @@ Public NotInheritable Class DispositionUtility
       ' se non ci sono ventose sotto il grezzo
       If Not bIsFixtureUnderRawPart Then
          ' verifico che il grezzo sia ad altezza tavola
-         If dRawPartMin.z <> 0 Then
-            Dim vtMove As New Vector3d(0, 0, -dRawPartMin.z)
+         If ptRawPartMin.z <> 0 Then
+            Dim vtMove As New Vector3d(0, 0, -ptRawPartMin.z)
             EgtMoveRawPart(nRawId, vtMove)
          End If
       Else
          ' se ci sono verifico che l'altezza del grezzo sia quella della ventosa più alta
-         If Math.Abs(dRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
-            Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - dRawPartMin.z)
+         If Math.Abs(ptRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
+            Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - ptRawPartMin.z)
             EgtMoveRawPart(nRawId, vtMove)
          End If
       End If

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersV.xaml

@@ -1,12 +1,12 @@
 <UserControl x:Class="FixtureParametersV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:EgtCAM5="clr-namespace:EgtCAM5">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:EgtCAM5="clr-namespace:EgtCAM5">
 
    <StackPanel>
 
       <ListBox Name="FixtureListBox" ItemsSource="{Binding FixtureTypeList}"
-               Height="150" IsSynchronizedWithCurrentItem="True" SelectedItem="{Binding SelectedFixtureType}">
+         Height="150" IsSynchronizedWithCurrentItem="True" SelectedItem="{Binding SelectedFixtureType}">
          <ListBox.Resources>
             <DataTemplate DataType="{x:Type EgtCAM5:FixtureType}">
                <Grid>
@@ -24,7 +24,7 @@
                <Border CornerRadius="1" Background="{StaticResource EgaltechBlue3}" FocusVisualStyle="{x:Null}">
                   <StackPanel Orientation="Horizontal">
                      <TextBlock Text="{Binding Name}" Foreground="White" Margin="5,0,0,0"
-                                FontSize="15" FontWeight="SemiBold"/>
+                              FontSize="15" FontWeight="SemiBold"/>
                   </StackPanel>
                </Border>
             </DataTemplate>
@@ -38,15 +38,15 @@
             </Style>
          </ListBox.ItemContainerStyle>
       </ListBox>
-
+      
       <TextBlock Text="{Binding FixtureErrorMsg,Mode=OneWay}" Margin="5,5,5,5"
-                 Style="{StaticResource ValidationErrorTextBlock}"/>
-
+         Style="{StaticResource ValidationErrorTextBlock}"/>
+      
       <UniformGrid Columns="2">
          <Button Content="Add" Height="30" Command="{Binding AddCommand}" CommandParameter="{Binding Path=SelectedItem, ElementName=FixtureListBox}"/>
          <Button Content="Remove" Height="30" Command="{Binding RemoveCommand}" CommandParameter="{Binding Path=SelectedItem, ElementName=FixtureListBox}"/>
       </UniformGrid>
-
+      
    </StackPanel>
-
+   
 </UserControl>

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb

@@ -36,7 +36,7 @@ Public Class FixtureParametersVM
 
    Public ReadOnly Property OkMsg As String
       Get
-         Return EgtMsg(5431)     ' Ok
+         Return EgtMsg(MSG_DISPOSITION + 1)
       End Get
    End Property
 
@@ -77,7 +77,7 @@ Public Class FixtureParametersVM
    Friend Sub UpdateFixtureTypeList()
       m_FixtureTypeList = New ObservableCollection(Of FixtureListItem)(FixtureType.ReadFixtureTypeFromMachIni())
       UpdateFixtureCount()
-      OnPropertyChanged(NameOf(FixtureTypeList))
+      OnPropertyChanged("FixtureTypeList")
    End Sub
 
    ' Definizione comandi
@@ -116,9 +116,9 @@ Public Class FixtureParametersVM
       ' recupero area della tavola
       Dim ptTableMin As Point3d
       Dim ptTableMax As Point3d
-      If Not EgtGetTableArea(1, ptTableMin, ptTableMax) Then
+      if Not EgtGetTableArea(1, ptTableMin, ptTableMax) Then
          m_FixtureErrorMsg = "Tavola non definita"
-         OnPropertyChanged(NameOf(FixtureErrorMsg))
+         OnPropertyChanged("FixtureErrorMsg")
          Return
       End If
       ' dimensioni tavola
@@ -129,7 +129,7 @@ Public Class FixtureParametersVM
       Dim nAddedFixtureId As Integer = EgtAddFixture(SelectedFixture.Name, ptTableMid, 0, 20)
       If nAddedFixtureId = GDB_ID.NULL Then
          m_FixtureErrorMsg = "Impossibile posizionare la ventosa sulla tavola"
-         OnPropertyChanged(NameOf(FixtureErrorMsg))
+         OnPropertyChanged("FixtureErrorMsg")
          Return
       End If
       ' Se la ventosa ha punti di hook da ancorare
@@ -160,7 +160,7 @@ Public Class FixtureParametersVM
       ' sottraggo la ventosa aggiunta dal conto di quelle disponibili
       SelectedFixture.UsedNumber += 1
       EgtDraw()
-      OnPropertyChanged(NameOf(FixtureErrorMsg))
+      OnPropertyChanged("FixtureErrorMsg")
    End Sub
 
    ' Funzione che cerca una posizione valida per la ventosa libera di muoversi
@@ -491,7 +491,7 @@ Public Class FixtureType
       Set(value As Integer)
          If value <> m_TotalNumber Then
             m_TotalNumber = value
-            NotifyPropertyChanged(NameOf(UsedTotalRatio))
+            NotifyPropertyChanged("UsedTotalRatio")
          End If
       End Set
    End Property
@@ -502,15 +502,15 @@ Public Class FixtureType
       Set(value As Integer)
          If value <> m_UsedNumber Then
             m_UsedNumber = value
-            NotifyPropertyChanged(NameOf(UsedTotalRatio))
+            NotifyPropertyChanged("UsedTotalRatio")
             If UsedNumber >= TotalNumber Then
                m_IsEnabled = False
                m_IsSelected = False
-               NotifyPropertyChanged(NameOf(IsSelected))
+               NotifyPropertyChanged("IsSelected")
             Else
                m_IsEnabled = True
             End If
-            NotifyPropertyChanged(NameOf(IsEnabled))
+            NotifyPropertyChanged("IsEnabled")
          End If
       End Set
    End Property

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.ComponentModel
+Imports EgtUILib
 
 Public Class RawPartOptionVM
    Inherits ViewModelBase
@@ -34,7 +35,7 @@ Public Class RawPartOptionVM
             End If
             EgtDraw()
             m_MoveWithFixture = value
-            OnPropertyChanged(NameOf(MoveWithFixture))
+            OnPropertyChanged("MoveWithFixture")
          End If
       End Set
    End Property
@@ -55,32 +56,32 @@ Public Class RawPartOptionVM
 
    Public ReadOnly Property NewMsg As String
       Get
-         Return EgtMsg(5433)     ' Nuovo
+         Return EgtMsg(MSG_DISPOSITION + 3)
       End Get
    End Property
    Public ReadOnly Property RemoveMsg As String
       Get
-         Return EgtMsg(5434)     ' Rimuovi
+         Return EgtMsg(MSG_DISPOSITION + 4)
       End Get
    End Property
    Public ReadOnly Property LenghtMsg As String
       Get
-         Return EgtMsg(5435)     ' Lunghezza
+         Return EgtMsg(MSG_DISPOSITION + 5)
       End Get
    End Property
    Public ReadOnly Property WidthMsg As String
       Get
-         Return EgtMsg(5436)     ' Larghezza
+         Return EgtMsg(MSG_DISPOSITION + 6)
       End Get
    End Property
    Public ReadOnly Property HeightMsg As String
       Get
-         Return EgtMsg(5437)     ' Altezza
+         Return EgtMsg(MSG_DISPOSITION + 7)
       End Get
    End Property
    Public ReadOnly Property PositionMsg As String
       Get
-         Return EgtMsg(5438)     ' Posizione
+         Return EgtMsg(MSG_DISPOSITION + 8)
       End Get
    End Property
 
@@ -121,7 +122,7 @@ Public Class RawPartOptionVM
    Public Sub NewRawPart()
       DispositionUtility.ShowParts()
       m_bRawPartParamVisibility = Visibility.Visible
-      OnPropertyChanged(NameOf(RawPartParamVisibility))
+      OnPropertyChanged("RawPartParamVisibility")
    End Sub
 
 #End Region ' NewRawPartCommand

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="BeamMillingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -174,6 +238,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class BeamMillingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml

@@ -7,7 +7,70 @@
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -163,6 +226,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class ChiselingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/FiveAxisMachinigParameterExpanderV.xaml

@@ -1,12 +1,76 @@
-<UserControl x:Class="FiveAxisMachinigParameterExpanderV"
+<UserControl x:Class="FiveAxisMachiningParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
    
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -152,6 +216,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/FiveAxisMachinigParameterExpanderV.xaml.vb

@@ -1,6 +1,6 @@
 Imports EgtWPFLib5.EgtFloating
 
-Public Class FiveAxisMachinigParameterExpanderV
+Public Class FiveAxisMachiningParameterExpanderV
 
    Private m_RightTrayV As RightTrayV
    Private EgtFloatingPanel As EgtFloatingPanel

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="GenMachiningParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -152,6 +216,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class GenMachiningParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml

@@ -1,10 +1,78 @@
 <UserControl x:Class="MachiningParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:EgtCAM5="clr-namespace:EgtCAM5">
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+      <sys:Int32 x:Key="TabMax">62</sys:Int32>
+      <sys:Int32 x:Key="TabMin">63</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel>
@@ -12,28 +80,25 @@
 
       <Button Name="ApplyMachBtn" Height="30" Content="{Binding UpdateMachiningBtnMsg}"
               Command="{Binding UpdateMachiningCommand}" Background="{Binding UpdateMachiningBtn_Background}"/>
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
+      <Grid Margin="0,2.5,0,2.5">
          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
-         <CheckBox Name="ViewToolBtn"
-                   Content="{Binding ViewToolBtnMsg}"
-                   IsChecked="{Binding ViewTool}"
-                   Style="{StaticResource ViewTool_CheckBox}"/>
+         <Button Command="{Binding PreviewMachiningTool_Command}"
+                 x:Name="ButtonPreview"
+                 Style="{StaticResource PreviewTool_Button}">
+            <Image Source="{Binding sToolPreview_Image}" Stretch="Uniform"/>
+         </Button>
 
-         <Slider Grid.Row="1" 
+         <Slider Grid.Column="1" 
                  x:Name="SliderV"
                  Value="{Binding SliderValue}"
-                 IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"
+                 IsEnabled="{Binding Slider_IsEnable}"
                  TickFrequency="{Binding SliderTick}"
                  Minimum="1"
                  Maximum="{Binding SliderScale}"
-                 IsSnapToTickEnabled="False"
                  Style="{StaticResource SliderValue_Slider}"/>
 
       </Grid>

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml.vb

@@ -1,3 +1,6 @@
+Imports EgtCAM5.MachiningParameterExpanderVM
+Imports EgtUILib
+
 Public Class MachiningParameterExpanderV
 
    Sub New()
@@ -6,9 +9,12 @@ Public Class MachiningParameterExpanderV
       InitializeComponent()
 
       ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
-
+      Me.SliderV.Focusable = False
       ' Associo il gestore evento m_EventFocusOnSlider all'evento generato da FocusOnSlider
       AddHandler Map.refMachiningParameterExpanderVM.m_EventFocusOnSlider, AddressOf FocusOnSlider
+      ' Associo il gestore evento m_EventFocusOnButtonPreview all'evento generato da FocusOnButtonPreview
+      AddHandler Map.refMachiningParameterExpanderVM.m_EventFocusOnButtonPreview, AddressOf FocusOnButtonPreview
+
    End Sub
 
    ''' <summary>
@@ -18,4 +24,11 @@ Public Class MachiningParameterExpanderV
       Me.SliderV.Focus()
    End Sub
 
+   ''' <summary>
+   ''' Funzione che mette il focus sul bottone
+   ''' </summary>
+   Friend Sub FocusOnButtonPreview()
+      Me.ButtonPreview.Focus()
+   End Sub
+
 End Class

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb

@@ -8,6 +8,32 @@ Public Class MachiningParameterExpanderVM
    ''' Evento che permette di mettere il focus sullo slider
    ''' </summary>
    Friend Event m_EventFocusOnSlider()
+   ''' <summary>
+   ''' Evento che permette di mettere il focus sul bottone
+   ''' </summary>
+   Friend Event m_EventFocusOnButtonPreview()
+
+   Private m_nPreviewMachiningTool As Integer
+   Public ReadOnly Property nPreviewMachiningTool As Integer
+      Get
+         Return m_nPreviewMachiningTool
+      End Get
+   End Property
+   Friend Sub SetPreviewMachiningTool(value As MCH_LOOK)
+      m_nPreviewMachiningTool = value
+      NotifyPropertyChanged(NameOf(nPreviewMachiningTool))
+   End Sub
+
+   Private m_sToolPreview_Image As String
+   Public ReadOnly Property sToolPreview_Image As String
+      Get
+         Return m_sToolPreview_Image
+      End Get
+   End Property
+   Friend Sub SetToolPreview_Image(value As String)
+      m_sToolPreview_Image = value
+      NotifyPropertyChanged(NameOf(sToolPreview_Image))
+   End Sub
 
    Private WithEvents m_CurrOperation As MachiningTreeViewItem
    Public Property CurrOperation As MachiningTreeViewItem
@@ -52,29 +78,6 @@ Public Class MachiningParameterExpanderVM
       End Get
    End Property
 
-   Private m_bPreviewTool As Boolean = False
-   Public Property ViewTool As Boolean
-      Get
-         Return m_bPreviewTool
-      End Get
-      Set(value As Boolean)
-         If value Then
-            EgtPreparePreviewMachiningTool()
-            m_bPreviewTool = True
-            ResetSliderValue()
-         Else
-            EgtRemovePreviewMachiningTool()
-            m_bPreviewTool = False
-            ResetSliderValue()
-         End If
-         EgtDraw()
-      End Set
-   End Property
-   Friend Sub SetViewTool(value As Boolean)
-      ViewTool = value
-      NotifyPropertyChanged(NameOf(ViewTool))
-   End Sub
-
    ' Slider per muovere l'utensile in aggiunta ai pulsanti indietro e avanti
    Private m_SliderScale As Integer = 100
    Public ReadOnly Property SliderScale As Integer
@@ -107,7 +110,7 @@ Public Class MachiningParameterExpanderVM
          Return m_SliderValue
       End Get
       Set(value As Integer)
-         If m_bPreviewTool Then
+         If m_nPreviewMachiningTool = MCH_LOOK.TAB_TOOL OrElse m_nPreviewMachiningTool = MCH_LOOK.TAB_HEAD Then
             Dim nId As Integer = EgtPreviewMachiningTool(m_nPtEntId, value - m_SliderValue)
             If nId <> GDB_ID.NULL Then m_nPtEntId = nId
             EgtDraw()
@@ -116,7 +119,7 @@ Public Class MachiningParameterExpanderVM
       End Set
    End Property
    Friend Sub ResetSliderValue()
-      If m_bPreviewTool Then
+      If m_nPreviewMachiningTool = MCH_LOOK.TAB_TOOL OrElse m_nPreviewMachiningTool = MCH_LOOK.TAB_HEAD Then
          m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
       Else
          m_nPtEntId = GDB_ID.NULL
@@ -125,8 +128,9 @@ Public Class MachiningParameterExpanderVM
       NotifyPropertyChanged(NameOf(SliderValue))
    End Sub
    Friend Sub SetSliderValue(value As Integer)
+      If m_nPreviewMachiningTool = MCH_LOOK.NONE Then Return
       Dim nOldSliderValue As Integer = m_SliderValue
-      m_SliderValue = Math.Min( Math.Max( m_SliderValue + value, 1), m_SliderScale)
+      m_SliderValue = Math.Min(Math.Max(m_SliderValue + value, 1), m_SliderScale)
       Dim nStep As Integer = m_SliderValue - nOldSliderValue
       If nStep = 0 Then Return
       Dim nId As Integer = EgtPreviewMachiningTool(m_nPtEntId, nStep)
@@ -135,6 +139,17 @@ Public Class MachiningParameterExpanderVM
       NotifyPropertyChanged(NameOf(SliderValue))
    End Sub
 
+   Private m_Slider_IsEnable As Boolean
+   Public ReadOnly Property Slider_IsEnable As Boolean
+      Get
+         Return m_Slider_IsEnable
+      End Get
+   End Property
+   Friend Sub SetSlider_IsEnable(value As Boolean)
+      m_Slider_IsEnable = value
+      NotifyPropertyChanged(NameOf(Slider_IsEnable))
+   End Sub
+
    Dim WoodDrillParamExpanderV As WoodDrillingParameterExpanderV
    Dim WoodSawParamExpanderV As WoodSawingParameterExpanderV
    Dim WoodMillParamExpanderV As WoodMillingParameterExpanderV
@@ -150,8 +165,9 @@ Public Class MachiningParameterExpanderVM
    Dim StoneDrillParamExpanderV As StoneDrillingParameterExpanderV
    Dim SurfFinishParamExpanderV As SurfFinishingParameterExpanderV
    Dim WjParamExpanderV As WaterjettingParameterExpanderV
-   Dim FiveAxExpanderV As FiveAxisMachinigParameterExpanderV
+   Dim FiveAxExpanderV As FiveAxisMachiningParameterExpanderV
    Dim SurfRoughExpanderV As SurfRoughingParameterExpanderV
+   Dim ProbExpanderV As ProbingParameterExpanderV
 
    Private Sub Dummy()
 
@@ -190,7 +206,7 @@ Public Class MachiningParameterExpanderVM
 
          Select Case nType
             Case MCH_OY.DRILLING
-               If MatType = MaterialType.STONE Then
+               If MatType = MaterialType.STONE5 Then
                   If IsNothing(StoneDrillParamExpanderV) Then StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
                   StoneDrillParamExpanderV.DataContext = m_CurrOperation
                   Return StoneDrillParamExpanderV
@@ -200,7 +216,7 @@ Public Class MachiningParameterExpanderVM
                   Return WoodDrillParamExpanderV
                End If
             Case MCH_OY.SAWING
-               If MatType = MaterialType.STONE Then
+               If MatType = MaterialType.STONE5 Then
                   If IsNothing(StoneSawParamExpanderV) Then StoneSawParamExpanderV = New StoneSawingParameterExpanderV
                   StoneSawParamExpanderV.DataContext = m_CurrOperation
                   Return StoneSawParamExpanderV
@@ -214,7 +230,7 @@ Public Class MachiningParameterExpanderVM
                   If IsNothing(BeamMillParamExpanderV) Then BeamMillParamExpanderV = New BeamMillingParameterExpanderV
                   BeamMillParamExpanderV.DataContext = m_CurrOperation
                   Return BeamMillParamExpanderV
-               ElseIf MatType = MaterialType.STONE Then
+               ElseIf MatType = MaterialType.STONE5 Then
                   If IsNothing(StoneMillParamExpanderV) Then StoneMillParamExpanderV = New StoneMillingParameterExpanderV
                   StoneMillParamExpanderV.DataContext = m_CurrOperation
                   Return StoneMillParamExpanderV
@@ -232,7 +248,7 @@ Public Class MachiningParameterExpanderVM
                StoneSawFinishParamExpanderV.DataContext = m_CurrOperation
                Return StoneSawFinishParamExpanderV
             Case MCH_OY.POCKETING
-               If MatType = MaterialType.STONE Or MatType = MaterialType.STONE5 Then
+               If MatType = MaterialType.STONE5 Then
                   ' se macchina di tipo STONE ricavo il tipo di utensile
                   Dim sMachiningToolName = String.Empty
                   EgtMdbSetCurrMachining(sName)
@@ -268,14 +284,21 @@ Public Class MachiningParameterExpanderVM
                WjParamExpanderV.DataContext = m_CurrOperation
                Return WjParamExpanderV
             Case MCH_OY.FIVEAXISMILLING
-               If IsNothing(FiveAxExpanderV) Then FiveAxExpanderV = New FiveAxisMachinigParameterExpanderV
+               If IsNothing(FiveAxExpanderV) Then FiveAxExpanderV = New FiveAxisMachiningParameterExpanderV
                FiveAxExpanderV.DataContext = m_CurrOperation
                Return FiveAxExpanderV
             Case MCH_OY.SURFROUGHING
                If IsNothing(SurfRoughExpanderV) Then SurfRoughExpanderV = New SurfRoughingParameterExpanderV
                SurfRoughExpanderV.DataContext = m_CurrOperation
                Return SurfRoughExpanderV
+            Case MCH_OY.PROBING
+               If IsNothing(ProbExpanderV) Then ProbExpanderV = New ProbingParameterExpanderV
+               ProbExpanderV.DataContext = m_CurrOperation
+               Return ProbExpanderV
          End Select
+
+         'MachiningParameterExpanderItem.ReadOperationParam()
+
          Return Nothing
       End Get
    End Property
@@ -284,41 +307,40 @@ Public Class MachiningParameterExpanderVM
 
    Public ReadOnly Property UpdateMachiningBtnMsg As String
       Get
-         Return EgtMsg(5403)     ' Applica Lavorazione
+         Return EgtMsg(MSG_OPERATION + 3)        'Applica Lavorazione
       End Get
    End Property
 
    Public ReadOnly Property ViewToolBtnMsg As String
       Get
-         Return EgtMsg(5413)     ' Anteprima Utensile
+         Return EgtMsg(MSG_OPERATION + 13)       'Anteprima Utensile
       End Get
    End Property
 
    Public ReadOnly Property NextStepToolBtnMsg As String
       Get
-         Return EgtMsg(5414)     ' Avanti
+         Return EgtMsg(MSG_OPERATION + 14)       'Avanti
       End Get
    End Property
 
    Public ReadOnly Property PrevStepToolBtnMsg As String
       Get
-         Return EgtMsg(5415)     ' Indietro
+         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
       End Get
    End Property
 
 #End Region    ' Messages
 
    ' Definizione comando
-   Private m_cmdNextStepTool As ICommand
-   Private m_cmdPrevStepTool As ICommand
    Private m_cmdUpdateMachining As ICommand
+   Private m_cmdPreviewMachiningTool As ICommand
 
 #Region "CONSTRUCTOR"
 
    Sub New()
       EgtWPFLib5.MachiningDbWindowVM.m_sMachineIniPath = IniFile.m_sCurrMachIniFilePath
       Map.SetRefMachiningParameterExpanderVM(Me)
-      NotifyPropertyChanged(NameOf(ParamExpanderPageV))
+      NotifyPropertyChanged("ParamExpanderPageV")
    End Sub
 
 #End Region    ' Constructor
@@ -332,6 +354,51 @@ Public Class MachiningParameterExpanderVM
       RaiseEvent m_EventFocusOnSlider()
    End Sub
 
+   ''' <summary>
+   ''' Funzione che attiva l'evento che mette il focus sul bottone
+   ''' </summary>
+   Public Sub FocusButtonPreview()
+      RaiseEvent m_EventFocusOnButtonPreview()
+   End Sub
+
+   Friend Sub PreviewMachiningTool()
+      Select Case nPreviewMachiningTool
+         Case MCH_LOOK.NONE
+            SetPreviewMachiningTool(MCH_LOOK.TAB_TOOL)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
+            SetSlider_IsEnable(True)
+         Case MCH_LOOK.TAB_TOOL
+            SetPreviewMachiningTool(MCH_LOOK.TAB_HEAD)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Head.png")
+            SetSlider_IsEnable(True)
+         Case MCH_LOOK.TAB_HEAD
+            SetPreviewMachiningTool(MCH_LOOK.NONE)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Delete.png")
+            SetSlider_IsEnable(False)
+      End Select
+      EgtChangePreviewMachiningToolShow(nPreviewMachiningTool)
+      EgtDraw()
+   End Sub
+
+   Friend Sub RevertPreviewMachiningTool()
+      Select Case nPreviewMachiningTool
+         Case MCH_LOOK.NONE
+            SetPreviewMachiningTool(MCH_LOOK.TAB_HEAD)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Head.png")
+            SetSlider_IsEnable(True)
+         Case MCH_LOOK.TAB_TOOL
+            SetPreviewMachiningTool(MCH_LOOK.NONE)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Delete.png")
+            SetSlider_IsEnable(False)
+         Case MCH_LOOK.TAB_HEAD
+            SetPreviewMachiningTool(MCH_LOOK.TAB_TOOL)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
+            SetSlider_IsEnable(True)
+      End Select
+      EgtChangePreviewMachiningToolShow(nPreviewMachiningTool)
+      EgtDraw()
+   End Sub
+
 #End Region    ' Methods
 
 #Region "COMMANDS"
@@ -362,92 +429,40 @@ Public Class MachiningParameterExpanderVM
                sErrorList += Environment.NewLine + " - " + m_CurrOperation.GetErrorString([property])
             End If
          Next [property]
-         'MessageBox.Show(EgtMsg(5423) + sErrorList, EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5423) + sErrorList, EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' La lavorazione non può essere applicata per i seguenti motivi: ATTENZIONE
+         MessageBox.Show(EgtMsg(5423) + sErrorList, EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Return
       End If
 
-      Dim bRecalc As Boolean = False
-      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-         bRecalc = True
-      Else
-         ' Controllo se il tipo e' dr o sr o lr bRecalc e' true come quando viene selezionato Shift
-         For Each ItemNote As NoteListBoxItem In m_CurrOperation.NotesList
-            bRecalc = ItemNote.Type.Equals("dr") OrElse ItemNote.Type.Equals("lr") OrElse ItemNote.Type.Equals("sr") OrElse ItemNote.Type.Equals("br")
-            If bRecalc Then Exit For
-         Next
-      End If
+      ' Verifico se forzato ricalcolo da interfaccia
+      Dim bRecalc As Boolean = ((Keyboard.Modifiers And ModifierKeys.Shift) <> 0)
 
-      ' La modifica di alcuni parametri forza il ricalcolo della geometria
-      Dim ModifiedGeometry As Boolean = m_CurrOperation.m_IsModifiedSelectedFaceUseType
-      ' aggiorno valori modificati
+      ' Aggiorno parametri di lavorazione
       m_CurrOperation.WriteOperationParam()
-      ' Carico tutta la geometria selezionata in una lista
-      Dim SelectedGeometry As New List(Of Integer)
-      Dim EntityIndex As Integer = EgtGetFirstSelectedObj()
-      While EntityIndex <> GDB_ID.NULL
-         SelectedGeometry.Add(EntityIndex)
-         EntityIndex = EgtGetNextSelectedObj()
+
+      ' Imposto geometria da lavorare (tutta quella selezionata)
+      Dim vId(EgtGetSelectedObjCount() - 1) As Integer
+      Dim vSub(EgtGetSelectedObjCount() - 1) As Integer
+      Dim nInd As Integer = 0
+      Dim EntId As Integer = EgtGetFirstSelectedObj()
+      While EntId <> GDB_ID.NULL
+         vId(nInd) = EntId
+         SelData.GetSubFromId(EntId, vSub(nInd))
+         nInd += 1
+         EntId = EgtGetNextSelectedObj()
       End While
-      ' Gestione speciale per superfici ( si aggiunge l'identificazione della faccia)
-      If SelectedGeometry.Count() > 0 AndAlso
-         (EgtGetType(SelectedGeometry(0)) = GDB_TY.SRF_MESH Or EgtGetType(SelectedGeometry(0)) = GDB_TY.SRF_FRGN) Then
-         ' Aggiorno lista speciale con facce
-         SelData.VerifyIdSub()
-         ' Verifico se geometria cambiata, confrontando selezione attuale con facet con geometria di lavorazione
-         Dim nInd As Integer = 0
-         Dim nMchId, nMchSub As Integer
-         EgtGetMachiningGeometry(nInd, nMchId, nMchSub)
-         Dim nSelId, nSelSub As Integer
-         SelData.GetIdSub(nInd, nSelId, nSelSub)
-         While Not ModifiedGeometry And (nMchId <> GDB_ID.NULL Or nSelId <> GDB_ID.NULL)
-            ' Controllo uguaglianza
-            If nMchId <> nSelId Or nMchSub <> nSelSub Then ModifiedGeometry = True
-            ' Passo al successivo
-            nInd += 1
-            EgtGetMachiningGeometry(nInd, nMchId, nMchSub)
-            SelData.GetIdSub(nInd, nSelId, nSelSub)
-         End While
-         If ModifiedGeometry Then
-            Dim vId() As Integer = Nothing
-            Dim vSub() As Integer = Nothing
-            SelData.GetAllIdSub(vId, vSub)
-            EgtSetMachiningGeometry(vId, vSub)
-         End If
-         ' Gestione standard per altre entità (curve, testi, ...)
-      Else
-         ' Verifico se geometria cambiata, confrontando selezione attuale con geometria di lavorazione
-         Dim nInd As Integer = 0
-         Dim nMchId, nMchSub As Integer
-         EgtGetMachiningGeometry(nInd, nMchId, nMchSub)
-         Dim nSelId As Integer
-         nSelId = If(nInd < SelectedGeometry.Count(), SelectedGeometry(nInd), GDB_ID.NULL)
-         While Not ModifiedGeometry And (nMchId <> GDB_ID.NULL Or nSelId <> GDB_ID.NULL)
-            ' Controllo uguaglianza
-            If nMchId <> nSelId Then ModifiedGeometry = True
-            ' Passo al successivo
-            nInd += 1
-            EgtGetMachiningGeometry(nInd, nMchId, nMchSub)
-            nSelId = If(nInd < SelectedGeometry.Count(), SelectedGeometry(nInd), GDB_ID.NULL)
-         End While
-         ' Imposto geometria selezionata come geometria di lavorazione
-         If ModifiedGeometry Then
-            EgtSetMachiningGeometry(SelectedGeometry.ToArray)
-         End If
-      End If
-      ' Ricalcolo la lavorazione
-      If Not EgtApplyMachining(bRecalc Or ModifiedGeometry) Then
+      EgtSetMachiningGeometry(vId, vSub)
+
+      ' Rigenero la lavorazione
+      If Not EgtApplyMachining(bRecalc) Then
          If EgtGetLastMachMgrErrorId() <> 0 Then
             Dim sErr As String = EgtGetLastMachMgrErrorString()
             Dim sInfo As String = String.Empty
             EgtGetOutstrokeInfo(sInfo)
             If Not String.IsNullOrEmpty(sInfo) Then sErr &= " " & sInfo
-            'MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)  ' ERRORE
+            MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Else
             ' Errore nel calcolo della lavorazione!
-            'MessageBox.Show(EgtMsg(5345), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)
-            EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5345), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)   ' Errore nel calcolo della lavorazione! ERRORE
+            MessageBox.Show(EgtMsg(5345), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)
          End If
       Else
          If EgtGetMachMgrWarningId(0) <> 0 Then
@@ -457,9 +472,13 @@ Public Class MachiningParameterExpanderVM
             Map.refStatusBarVM.NotifyStatusOutput("")
          End If
       End If
+
       ' Restart visualizzazione utensile
-      SetSliderScale( EgtGetPreviewMachiningToolStepCount())
-      SetViewTool(True)
+      EgtPreparePreviewMachiningTool()
+      EgtChangePreviewMachiningToolShow(nPreviewMachiningTool)
+      SetSliderScale(EgtGetPreviewMachiningToolStepCount())
+      SetSlider_IsEnable(True)
+      ResetSliderValue()
       IsModified(False)
       ErrorOnOperation(False)
       EgtDraw()
@@ -468,20 +487,88 @@ Public Class MachiningParameterExpanderVM
 
 #End Region    ' UpdateMachiningCommand
 
+#Region "PreviewMachiningTool_Command"
+
+   Public ReadOnly Property PreviewMachiningTool_Command As ICommand
+      Get
+         If m_cmdPreviewMachiningTool Is Nothing Then
+            m_cmdPreviewMachiningTool = New RelayCommand(AddressOf PreviewMachiningTool)
+         End If
+         Return m_cmdPreviewMachiningTool
+      End Get
+   End Property
+
+   Public Sub PreviewMachiningTool(ByVal param As Object)
+      PreviewMachiningTool()
+   End Sub
+
+#End Region    ' PreviewMachiningTool_Command
+
 #End Region    ' Commands
 
    Private Sub IsModified(IsModified As Boolean) Handles m_CurrOperation.m_IsModified
       m_CurrOperation_IsModified = IsModified
-      NotifyPropertyChanged(NameOf(UpdateMachiningBtn_Background))
+      ' NotifyPropertyChanged("CurrOperation_IsModified")
+      NotifyPropertyChanged("UpdateMachiningBtn_Background")
    End Sub
 
    Private Sub ErrorOnOperation(ErrorOnOperation As Boolean) Handles m_CurrOperation.m_ErrorOnOperation
       m_CurrOperation_ErrorOnOperation = ErrorOnOperation
-      NotifyPropertyChanged(NameOf(UpdateMachiningBtn_Background))
+      ' NotifyPropertyChanged("CurrOperation_ErrorOnOperation")
+      NotifyPropertyChanged("UpdateMachiningBtn_Background")
    End Sub
 
 End Class
 
+''' <summary>
+''' Class that represent a Converter that use machining type and param type, to set the visibility state of the param type.
+''' </summary>
+Public Class OperationParamVisibilityConverter
+   Implements IValueConverter
+
+   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
+      Select Case CInt(value)
+         Case MCH_OY.NONE
+            Return Visibility.Hidden
+         Case MCH_OY.DISP
+            Return TMDbParamVisibility.OperationDisposition(CInt(parameter))
+         Case MCH_OY.DRILLING
+            Return TMDbParamVisibility.Drilling(CInt(parameter))
+         Case MCH_OY.SAWING
+            Return TMDbParamVisibility.Sawing(CInt(parameter))
+         Case MCH_OY.MILLING
+            Return TMDbParamVisibility.Milling(CInt(parameter))
+         Case MCH_OY.POCKETING
+            Return TMDbParamVisibility.Pocketing(CInt(parameter))
+         Case MCH_OY.MORTISING
+            Return TMDbParamVisibility.Mortising(CInt(parameter))
+         Case MCH_OY.SAWROUGHING
+            Return TMDbParamVisibility.Sawroughing(CInt(parameter))
+         Case MCH_OY.SAWFINISHING
+            Return TMDbParamVisibility.Sawfinishing(CInt(parameter))
+         Case MCH_OY.GENMACHINING
+            Return TMDbParamVisibility.GenMachining(CInt(parameter))
+         Case MCH_OY.CHISELING
+            Return TMDbParamVisibility.Chiseling(CInt(parameter))
+         Case MCH_OY.SURFFINISHING
+            Return TMDbParamVisibility.SurfFinishing(CInt(parameter))
+         Case MCH_OY.SURFROUGHING
+            Return TMDbParamVisibility.SurfRoughing(CInt(parameter))
+         Case MCH_OY.WATERJETTING
+            Return TMDbParamVisibility.WaterJetting(CInt(parameter))
+         Case MCH_OY.FIVEAXISMILLING
+            Return TMDbParamVisibility.FiveAxMachining(CInt(parameter))
+         Case Else
+            Return Visibility.Hidden
+      End Select
+   End Function
+
+   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New NotImplementedException
+   End Function
+
+End Class
+
 ''' <summary>
 ''' Class that represent a Converter that convert mm in inch if necessary for the param depth.
 ''' </summary>

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="MortisingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -170,6 +234,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class MortisingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="PocketingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -179,6 +243,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class PocketingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ProbingParameterExpanderV.xaml

@@ -0,0 +1,275 @@
+<UserControl x:Class="ProbingParameterExpanderV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+   
+   <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+   </UserControl.Resources>
+
+   <StackPanel Name="OperationParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
+         <UniformGrid Columns="2">
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+                                                  Converter={StaticResource DepthUnitConverter}}"
+                                   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>
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
+         <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 SubTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=SubTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
+            </StackPanel>
+         </Expander>
+
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
+                             Margin="2.5"/>
+                  <Button Command="{Binding ShowNoteListComboCommand}"
+                          ToolTip="{Binding ShowNoteToolTip}"
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
+                          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:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
+                                          ParamChBx="{Binding Path=InvertToolDir,
+                                                              UpdateSourceTrigger=PropertyChanged,
+                                                              ValidatesOnDataErrors=True}" 
+                                          Style="{DynamicResource CheckParamV_Margin}"/>
+                  <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, UpdateSourceTrigger=PropertyChanged}"/>
+                                 </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </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.Header>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
+            </Expander.Header>
+            <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Feed,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
+                                        ParamTxBx="{Binding Path=TipFeed,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
+                                        ParamTxBx="{Binding Path=EndFeed,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
+         </Expander>
+         <Interactivity:Interaction.Behaviors>
+            <EgtCAM5:AutomaticCloseExpander/>
+         </Interactivity:Interaction.Behaviors>
+      </StackPanel>
+   </StackPanel>
+
+</UserControl>

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ProbingParameterExpanderV.xaml.vb

@@ -0,0 +1,83 @@
+Imports EgtWPFLib5.EgtFloating
+
+Public Class ProbingParameterExpanderV
+
+   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
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
+         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
+         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
+         m_bFirst = False
+      End If
+      CalculateOperationParametersStackPanelMaxHeight()
+   End Sub
+
+   Dim m_bSizeChanging As Boolean = False
+
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+      If m_bSizeChanging Then Return
+      m_bSizeChanging = True
+      CalculateOperationParametersStackPanelMaxHeight()
+      m_bSizeChanging = False
+   End Sub
+
+   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)
+      For Index = 0 To AutomaticCloseExpanderStackPanel.Children.Count - 1
+         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
+            Dim IndexedExpander As Expander = DirectCast(AutomaticCloseExpanderStackPanel.Children(Index), Expander)
+            If IndexedExpander.IsExpanded Then
+               OpenedExpanderList.Add(True)
+               IndexedExpander.IsExpanded = False
+               Dim CurrExpanderContent As FrameworkElement = DirectCast(IndexedExpander.Content, FrameworkElement)
+               CurrExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+               AutomaticCloseExpanderStackPanelHeight -= CurrExpanderContent.DesiredSize.Height
+               ' Sottraggo anche i padding
+               AutomaticCloseExpanderStackPanelHeight -= (IndexedExpander.Padding.Top + IndexedExpander.Padding.Bottom)
+            Else
+               OpenedExpanderList.Add(False)
+            End If
+         Else
+            OpenedExpanderList.Add(False)
+         End If
+      Next
+      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
+            Dim IndexedExpander As Expander = DirectCast(AutomaticCloseExpanderStackPanel.Children(Index), Expander)
+            If OpenedExpanderList(Index) Then
+               IndexedExpander.IsExpanded = True
+            End If
+         End If
+      Next
+   End Sub
+
+   ' Funzione che permette di trovare il primo contenitore di tipo T di un elemento grafico dependencyObject 
+   Public Function FindAncestor(Of T As Class)(dependencyObject As DependencyObject) As T
+      Dim target As DependencyObject = dependencyObject
+      Do
+         target = LogicalTreeHelper.GetParent(target)
+      Loop While target IsNot Nothing AndAlso Not (TypeOf target Is T)
+      If IsNothing(target) Then
+         target = dependencyObject
+         Do
+            target = VisualTreeHelper.GetParent(target)
+         Loop While target IsNot Nothing AndAlso Not (TypeOf target Is T)
+      End If
+      Return TryCast(target, T)
+   End Function
+
+End Class

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="StoneDrillingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -151,6 +215,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneDrillingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="StoneMillingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -155,6 +219,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneMillingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="StoneSawFinishingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -149,6 +213,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneSawFinishingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="StoneSawRoughingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -60,10 +124,10 @@
                                                             ValidatesOnDataErrors=True}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
                <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtLinkTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=ExtLinkTypeList,
+                                       ParamCmBxList="{Binding Path=LeadLinkTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}" 
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </StackPanel>
          </Expander>
@@ -147,6 +211,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneSawRoughingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="StoneSawingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -155,6 +219,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneSawingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="SurfFinishingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -162,6 +226,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5.EgtFloating
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class SurfFinishingParameterExpanderV
 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml

@@ -1,12 +1,76 @@
 <UserControl x:Class="SurfRoughingParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
    
    <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -172,6 +236,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"