-aggiunto gestione lampadina su operazione selezionta

-aggiunto info note

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 &= "SupportPlan " & sAssStatus & Environment.NewLine
+      sInfo &= "SupportPlane " & sAssStatus & Environment.NewLine
       sInfo &= "DataRoot " & IniFile.m_sDataRoot & Environment.NewLine
       If IniFile.m_ProjectMode <> ProjectModeOpt.ONLYDRAW Then
          sInfo &= "MachinesRoot " & IniFile.m_sMachinesRoot & Environment.NewLine
@@ -70,24 +70,6 @@ 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 = "---"

Base/TreeView/TreeViewItemBase.vb

@@ -1,5 +1,7 @@
 Imports System.Collections.ObjectModel
 Imports System.ComponentModel
+Imports EgtUILib
+Imports EgtUILib.EgtInterface
 
 ' Classe che definisce un elemento di base del TreeView
 Public Class TreeViewItemBase
@@ -32,7 +34,7 @@ Public Class TreeViewItemBase
    End Property
 
    Friend m_isExpanded As Boolean
-   Public  Property IsExpanded As Boolean
+   Public Property IsExpanded As Boolean
       Get
          Return m_isExpanded
       End Get

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.OnCloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.m_CloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

Constants/ConstGen.vb

@@ -51,9 +51,6 @@ 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_SHOWSURFQUALITY As String = "ShowSurfQuality"
+   Public Const K_SHOWTRIAADV As String = "ShowTriaAdv"
    Public Const K_SHOWZMAP As String = "ShowZmap"
    Public Const K_TEXMAXLINPIX As String = "TextureMaxLinPixels"
    Public Const K_ZOOMWIN As String = "ZoomWin"
@@ -144,6 +144,10 @@ 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"
@@ -157,21 +161,6 @@ 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"
@@ -200,8 +189,7 @@ 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_SELGEOMPROBING As String = "SelGeomProbing"
-   Public Const K_VMILLQUALITY As String = "VMillQuality"
+   Public Const K_SELVMILLQUALITY As String = "VMillQuality"
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
    Public Const K_SHOWONLYTABLE As String = "ShowOnlyTable"
    Public Const K_MOVETHROUGHDISPS As String = "MoveThroughDisps"
@@ -210,7 +198,6 @@ 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,13 +1,6 @@
 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"
@@ -15,17 +8,22 @@
    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"
@@ -39,12 +37,18 @@
    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_5AXMILLING As String = "5AxMilling"
-   Public Const K_5AXSCRIPT As String = "5AxScript"
+   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_DISPOSITION As String = "Disposition"
    Public Const K_DISP_INITSCRIPT As String = "InitScript"
@@ -64,16 +68,7 @@
    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,7 +11,7 @@
       m_CurrSetUpVM = CurrSetUpVM
    End Sub
 
-   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.OnCloseWindow
+   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.m_CloseWindow
    '   Me.DialogResult = bDialogResult
    'End Sub
 

DrawPanel/DrawPanelV.xaml

@@ -34,11 +34,6 @@
                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}">
@@ -49,28 +44,21 @@
                Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
             </Button>
-            <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}"
+            <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCP.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
-               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 CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding Rectangle2PToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">

DrawPanel/DrawPanelVM.vb

@@ -50,7 +50,7 @@ Public Class DrawPanelVM
          Return EgtMsg(MSG_DRAWPANEL + 3)
       End Get
    End Property
-   Public ReadOnly Property CircleCPToolTip As String
+   Public ReadOnly Property CirclePDToolTip As String
       Get
          Return EgtMsg(MSG_DRAWPANEL + 4)
       End Get
@@ -72,25 +72,14 @@ Public Class DrawPanelVM
    End Property
    Public ReadOnly Property Arc3PToolTip As String
       Get
-         Return EgtMsg(5207)
-      End Get
-   End Property
-   Public ReadOnly Property Arc2PRToolTip As String
-      Get
-         Return EgtMsg(5169)
+         Return EgtMsg(MSG_DRAWPANEL + 7)
       End Get
    End Property
    Public ReadOnly Property ArcPDPToolTip As String
       Get
          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(MSG_DRAWPANEL + 11)
@@ -481,9 +470,7 @@ 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
@@ -761,29 +748,6 @@ 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>
@@ -814,33 +778,6 @@ 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>
@@ -1530,8 +1467,6 @@ 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
@@ -2221,7 +2156,6 @@ 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

@@ -164,10 +164,6 @@
     <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>
@@ -177,9 +173,6 @@
       <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>
@@ -293,20 +286,8 @@
     <Compile Include="Special-BeamWall\WallPanelV.xaml.vb">
       <DependentUpon>WallPanelV.xaml</DependentUpon>
     </Compile>
-    <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="Special-BeamWall\Wall.vb" />
     <Compile Include="SpecialPanel\SpecialPanelV.xaml.vb">
       <DependentUpon>SpecialPanelV.xaml</DependentUpon>
     </Compile>
@@ -322,7 +303,6 @@
     <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" />
@@ -483,10 +463,6 @@
       <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>
@@ -499,10 +475,6 @@
       <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>
@@ -655,18 +627,6 @@
       <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>
@@ -1079,22 +1039,7 @@
     <Resource Include="Resources\DrawPanel\StmMoveVertex.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\DrawPanel\Arc2PR.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\BiArc.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ExecuteWindow\reload.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ToolPreview\Head.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ToolPreview\Tool.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ToolPreview\Delete.png" />
+    <Resource Include="Resources\TreeView\LampSel.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>

ExecutePanel/ExecutePanelV.xaml

@@ -6,7 +6,7 @@
 
    <StackPanel Orientation="Horizontal">
       <Button Command="{Binding ExecCommand}" ToolTip="{Binding ExecToolTip}"
-              Style="{StaticResource GridViewPanelButton}" ContextMenuService.Placement="Bottom">
+         Style="{StaticResource GridViewPanelButton}" ContextMenuService.Placement="Bottom">
          <Button.ContextMenu>
             <ContextMenu ItemsSource="{Binding MruScriptNames}" ItemContainerStyle="{StaticResource MruScriptItem}">
             </ContextMenu>

ExecutePanel/ExecutePanelVM.vb

@@ -65,13 +65,8 @@ Public Class ExecutePanelVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Sub Exec(ByVal param As Object)
-      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
+      Map.refProjectVM.PreExecScript(True)
+      Map.refProjectVM.ExecScript(String.Empty)
    End Sub
 
 #End Region    ' ExecCommand

ExecuteWindow/ExecuteWindowV.xaml

@@ -1,39 +0,0 @@
-<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

@@ -1,32 +0,0 @@
-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

@@ -1,130 +0,0 @@
-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

MachGroupPanel/MyMachGroupPanelVM.vb

@@ -311,19 +311,19 @@ Public Class MyMachGroupPanelVM
    End Sub
 
    Private Sub LoadMaterialType()
-      Dim sMatType As String = MCH_MAT_WOOD
+      Dim sMatType As String = "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_MCH_GENERAL, K_MATERIAL, sMatType, sMatType, sMachineIniPath)
+      EgtUILib.GetPrivateProfileString(S_GENERAL, EgtWPFLib5.EstConstMachIni.K_MATERIAL, sMatType, sMatType, sMachineIniPath)
       Select Case sMatType
-         Case MCH_MAT_STONE
-            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE5
-         Case MCH_MAT_WOOD
+         Case "Stone"
+            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE
+         Case "Wood"
             EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.WOOD
-         Case MCH_MAT_BEAM
+         Case "Beam"
             EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.BEAM
-         Case MCH_MAT_ADDITIVE
+         Case "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 

MachOptionsWindow/MachOptionV.xaml

@@ -16,8 +16,10 @@
 
    <Grid Margin="10">
       <Grid.ColumnDefinitions>          
-         <ColumnDefinition Width="40*"/>
-         <ColumnDefinition Width="20*"/>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
@@ -26,8 +28,6 @@
          <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,24 +57,12 @@
          </ComboBox>
       </UniformGrid>
 
-      <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">
+      <UniformGrid Grid.Row="4" Columns="2" Margin="0,0,0,5">
          <TextBlock Text="{Binding ApproxLinTolMsg}" VerticalAlignment="Center"/>
          <TextBox Text="{Binding ApproxLinTol}" Height="25" Margin="10,0,0,0"/>
       </UniformGrid>
 
-      <UniformGrid Grid.Row="7" Columns="2">
+      <UniformGrid Grid.Row="5" Columns="2">
          <TextBlock Text="{Binding DefaultSetUpMsg}" VerticalAlignment="Center"/>
          <ComboBox ItemsSource="{Binding ArchivedSetUpList}" Height="25" Margin="10,0,0,0"
             SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>

MachOptionsWindow/MachOptionVM.vb

@@ -1,6 +1,5 @@
 Imports System.IO
 Imports EgtUILib
-Imports EgtWPFLib5
 
 Public Class MachOptionVM
 
@@ -49,6 +48,21 @@ Public Class MachOptionVM
       End Set
    End Property
 
+   Private m_sApproxLinTol As String
+   Public Property ApproxLinTol As String
+      Get
+         Return m_sApproxLinTol
+      End Get
+      Set(value As String)
+         Dim dApproxLinTol As Double = 0
+         If StringToLen(value, dApproxLinTol) Then
+            EgtMdbSetGeneralParam(MCH_GP.APPROXLINTOL, dApproxLinTol)
+            EgtMdbSave()
+            m_sApproxLinTol = value
+         End If
+      End Set
+   End Property
+
    Private m_SplitArcsList As New List(Of MCH_SA)({MCH_SA.NEVER, MCH_SA.GEN_PLANE, MCH_SA.NO_XY_PLANE, MCH_SA.ALWAYS})
    Public ReadOnly Property SplitArcsList As List(Of MCH_SA)
       Get
@@ -68,51 +82,6 @@ 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
@@ -152,6 +121,11 @@ Public Class MachOptionVM
          Return EgtMsg(MSG_MACHININGOPTIONPAGE + 9)
       End Get
    End Property
+   Public ReadOnly Property ApproxLinTolMsg As String
+      Get
+         Return EgtMsg(6410)         ' Tolleranza di approssimazione
+      End Get
+   End Property
 
    Public ReadOnly Property SplitArcsMsg As String
       Get
@@ -159,24 +133,6 @@ Public Class MachOptionVM
       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(MSG_MACHININGOPTIONPAGE + 7)
@@ -205,14 +161,6 @@ 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)
@@ -237,17 +185,6 @@ 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"

MainWindow/MainWindowVM.vb

@@ -46,13 +46,6 @@ Public Class MainWindowVM
       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
@@ -104,11 +97,11 @@ Public Class MainWindowVM
 
    Public ReadOnly Property IconSource As String
       Get
-#If PLATFORM = "x64" Then
+         #If PLATFORM = "x64" Then
             Return "/Resources/EgtCAM5_64.ico"
-#Else
-         Return "/Resources/EgtCAM5.ico"
-#End If
+         #else
+            Return "/Resources/EgtCAM5.ico"
+         #End If
       End Get
    End Property
 
@@ -196,7 +189,13 @@ Public Class MainWindowVM
          ' Salvo impostazione macchina corrente
          Map.refMachinePanelVM.SaveCurrentMachine()
          ' Aggiorno istanze usate
-         ReleaseInstance()
+         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()
          ' Chiudo la finestra principale del programma
          Application.Current.MainWindow.Close()
       Else
@@ -204,9 +203,15 @@ 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
-      ReleaseInstance()
+      m_objMutex.WaitOne(1000)
+      Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
+      nTmp -= (1 << (IniFile.m_nInstance - 1))
+      WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
+      m_objMutex.ReleaseMutex()
+      ' Rilascio mutex
+      If Not IsNothing(m_objMutex) Then m_objMutex.Close()
       ' Dichiaro di procedere con la terminazione del programma
       Return True
    End Function
@@ -301,9 +306,12 @@ 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
-      ReleaseInstance()
-      ' Termino
+      Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
+      nTmp -= (1 << (IniFile.m_nInstance - 1))
+      WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
       Application.Current.Shutdown()
    End Sub
 
@@ -354,8 +362,6 @@ 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
@@ -379,8 +385,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3103, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 3103, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2703, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2703, 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
@@ -523,17 +529,6 @@ 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
@@ -602,25 +597,18 @@ 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) AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
+      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
          Map.refMachiningParameterExpanderVM.FocusSlider()
-         Dim nStep As Integer = If(e.Key = Key.Right, 1, -1)
+         Dim nStep As Integer = If(e.Key = Key.Right OrElse e.Key = Key.Up, 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
 

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-2026 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2016-2025 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("3.1.3.2")>
-<Assembly: AssemblyFileVersion("3.1.3.2")>
+<Assembly: AssemblyVersion("2.7.3.2")>
+<Assembly: AssemblyFileVersion("2.7.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.42000
+'     Runtime Version:4.0.30319.34209
 '
 '     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", "17.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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.42000
+'     Runtime Version:4.0.30319.34209
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -12,16 +12,15 @@ Option Strict On
 Option Explicit On
 
 
-Namespace My
+
+<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)
     
-    <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
@@ -29,17 +28,17 @@ Namespace My
     Private Shared addedHandlerLockObject As New Object
 
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal 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
@@ -50,11 +49,10 @@ Namespace My
                     End SyncLock
                 End If
 #End If
-                Return defaultInstance
-            End Get
-        End Property
-    End Class
-End Namespace
+            Return defaultInstance
+        End Get
+    End Property
+End Class
 
 Namespace My
     
@@ -64,9 +62,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.EgtCAM5.My.MySettings
+        Friend ReadOnly Property Settings() As Global.EgtCAM5.MySettings
             Get
-                Return Global.EgtCAM5.My.MySettings.Default
+                Return Global.EgtCAM5.MySettings.Default
             End Get
         End Property
     End Module

OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml

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

OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb

@@ -21,7 +21,6 @@ Public Class InfoExpanderVM
       Set(value As Boolean)
          If value <> m_IsExpanded Then
             m_IsExpanded = value
-            Map.refDrawOptionPanelVM.SetInfoRowIsExpanded(m_IsExpanded)
             OnPropertyChanged("IsEnabled")
          End If
       End Set

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml

@@ -23,9 +23,9 @@
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <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 x:Name="Txt" Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"  
+                     PreviewKeyDown="TextBox_PreviewKeyDown" Height="Auto"
+                     Visibility="{Binding TextVisibility}" Margin="5,0,5,5">
                <TextBox.InputBindings>
                   <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
                   <KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>
@@ -45,6 +45,44 @@
          <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
                    Visibility="{Binding ComboVisibility}" Margin="5,5,5,5"/>
 
+         <ScrollViewer HorizontalScrollBarVisibility="Auto"
+                       VerticalScrollBarVisibility="Auto"
+                       MaxHeight="190"
+                       Margin="2,5,0,10">
+            <ItemsControl ItemsSource="{Binding InfoList}"
+                          Visibility="{Binding InfoVisibility}">
+               <ItemsControl.ItemTemplate>
+                  <DataTemplate>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding Key}"
+                                   ToolTip="{Binding Key}"
+                                   Width="70"
+                                   HorizontalAlignment="Left"
+                                   Margin="0,6,0,0"/>
+                        <TextBox Grid.Column="1" 
+                                 Text="{Binding Valour, UpdateSourceTrigger=PropertyChanged}"
+                                 Margin="8,5,2,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="2,-2,4,5"/>
+                     </Grid>
+                  </DataTemplate>
+               </ItemsControl.ItemTemplate>
+            </ItemsControl>
+         </ScrollViewer>
+
          <Grid Margin="5,0,5,5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb

@@ -1,17 +1,11 @@
 Public Class InputExpanderV
 
    Private Sub TextBox_PreviewKeyDown(sender As Object, e As KeyEventArgs)
-      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
+      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

@@ -1,6 +1,5 @@
 Imports System.Collections.ObjectModel
 Imports EgtUILib
-Imports MS.Internal
 
 Public Class InputExpanderVM
    Inherits ViewModelBase
@@ -8,10 +7,21 @@ Public Class InputExpanderVM
 #Region "FIELDS & PROPERTIES"
 
    ' Variabile temporanea per salvare bShow
-   Private m_bTempShow As Boolean
+   Private m_tmpbShow As Boolean
 
-   ' Lista temporanea delle Info
-   Private m_TempInfoList As New List(Of InfoItem)
+   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(NameOf(tmpInfoList))
+      End Set
+   End Property
 
    ' Expander fields
    Private m_IsExpanded As Boolean
@@ -21,7 +31,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_IsExpanded = value
-         OnPropertyChanged("IsExpanded")
+         OnPropertyChanged(NameOf(IsExpanded))
       End Set
    End Property
 
@@ -32,7 +42,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_IsEnabled = value
-         OnPropertyChanged("IsEnabled")
+         OnPropertyChanged(NameOf(IsEnabled))
       End Set
    End Property
 
@@ -43,7 +53,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_Title = value
-         OnPropertyChanged("Title")
+         OnPropertyChanged(NameOf(Title))
       End Set
    End Property
 
@@ -55,7 +65,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_TextBlock = value
-         OnPropertyChanged("TextBlock")
+         OnPropertyChanged(NameOf(TextBlock))
       End Set
    End Property
 
@@ -68,7 +78,7 @@ Public Class InputExpanderVM
       Set(value As String)
          m_TextBox = value
          Map.refProjectVM.NotifyInputText(value)
-         OnPropertyChanged("TextBox")
+         OnPropertyChanged(NameOf(TextBox))
       End Set
    End Property
 
@@ -80,7 +90,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_TextVisibility Then
             m_TextVisibility = value
-            OnPropertyChanged("TextVisibility")
+            OnPropertyChanged(NameOf(TextVisibility))
          End If
       End Set
    End Property
@@ -92,7 +102,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_FocusTextBox = value
-         OnPropertyChanged("FocusTextBox")
+         OnPropertyChanged(NameOf(FocusTextBox))
       End Set
    End Property
 
@@ -104,7 +114,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_CheckBoxText = value
-         OnPropertyChanged("CheckBoxText")
+         OnPropertyChanged(NameOf(CheckBoxText))
       End Set
    End Property
 
@@ -117,7 +127,7 @@ Public Class InputExpanderVM
          If value <> m_IsChecked Then
             Map.refProjectVM.SetLastBoolean(value)
             m_IsChecked = value
-            OnPropertyChanged("IsChecked")
+            OnPropertyChanged(NameOf(IsChecked))
          End If
       End Set
    End Property
@@ -130,7 +140,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_CheckVisibility Then
             m_CheckVisibility = value
-            OnPropertyChanged("CheckVisibility")
+            OnPropertyChanged(NameOf(CheckVisibility))
          End If
       End Set
    End Property
@@ -143,36 +153,54 @@ Public Class InputExpanderVM
       End Get
       Set(value As ObservableCollection(Of String))
          m_ComboItemsList = value
-         OnPropertyChanged("ComboItemsList")
+         OnPropertyChanged(NameOf(ComboItemsList))
       End Set
    End Property
 
-   Private m_ComboSelectedIndex As Integer
+   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(NameOf(InfoList))
+      End Set
+   End Property
+
+   Private m_ComboSelectedIndex As Integer = GDB_ID.NULL
    Public Property ComboSelectedIndex As Integer
       Get
          Return m_ComboSelectedIndex
       End Get
       Set(value As Integer)
-         If m_bTempShow Then Map.refProjectVM.SetLastInteger(value)
+         If m_tmpbShow Then Map.refProjectVM.SetLastInteger(value)
          m_ComboSelectedIndex = value
-         ' 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
+         ' 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, tmpInfoList(m_ComboSelectedIndex).sValour))
+               ' Nascondo la combobox
+               ComboVisibility = Visibility.Collapsed
+               ' Rimuovo la info dalla ComboItemsList
+               ComboItemsList.Remove(tmpInfoList(m_ComboSelectedIndex).sKey)
             End If
-            ComboVisibility = Visibility.Collapsed
-            ComboItemsList.RemoveAt(m_ComboSelectedIndex)
-            m_TempInfoList.RemoveAt(m_ComboSelectedIndex)
-            m_ComboSelectedIndex = -1
-            If ComboItemsList.Count <= 0 Then ShowInfoItemVisibility = Visibility.Collapsed
+            ' Rimuovo la info dalla tmpInfoList
+            tmpInfoList.Remove(tmpInfoList(tmpComboSelectedIndex))
          End If
-         OnPropertyChanged("ComboSelectedIndex")
-         OnPropertyChanged("ComboItemsList")
-         OnPropertyChanged("TextBox")
+         ' Rendo invisibile il pulsante per attivare la combo
+         If ComboItemsList.Count <= 0 Then ShowInfoItemVisibility = Visibility.Collapsed
+         m_ComboSelectedIndex = GDB_ID.NULL
+         OnPropertyChanged(NameOf(ComboSelectedIndex))
+         OnPropertyChanged(NameOf(ComboItemsList))
+         OnPropertyChanged(NameOf(InfoList))
       End Set
    End Property
 
@@ -184,7 +212,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_ComboVisibility Then
             m_ComboVisibility = value
-            OnPropertyChanged("ComboVisibility")
+            OnPropertyChanged(NameOf(ComboVisibility))
          End If
       End Set
    End Property
@@ -197,7 +225,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Visibility)
          m_ShowBtnVisibility = value
-         OnPropertyChanged("ShowBtnVisibility")
+         OnPropertyChanged(NameOf(ShowBtnVisibility))
       End Set
    End Property
 
@@ -212,7 +240,23 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_ShowInfoItemVisibility Then
             m_ShowInfoItemVisibility = value
-            OnPropertyChanged("ShowInfoItemVisibility")
+            OnPropertyChanged(NameOf(ShowInfoItemVisibility))
+         End If
+      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(NameOf(InfoVisibility))
          End If
       End Set
    End Property
@@ -221,6 +265,7 @@ Public Class InputExpanderVM
    Private m_cmdShow As ICommand
    Private m_cmdDone As ICommand
    Private m_cmdShowInfoItem As ICommand
+   Private m_cmdRemoveInfoItem As ICommand
 
 #Region "Messages"
 
@@ -244,7 +289,6 @@ Public Class InputExpanderVM
    Sub New()
       ' Creo riferimento a questa classe in EgtCAM5Map
       Map.SetRefInputExpanderVM(Me)
-      ComboSelectedIndex = -1
    End Sub
 
 #End Region    ' Constructor
@@ -299,7 +343,18 @@ Public Class InputExpanderVM
    ''' Execute the Point.  This method is invoked by the PointCommand.
    ''' </summary>
    Public Sub Done(ByVal param As Object)
-      Map.refProjectVM.Done(m_TextBox)
+      ' 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
+      ' Rimuovo eventuali spazi
+      Dim tmpTextBox As String = m_TextBox.Replace(" ", "")
+      Map.refProjectVM.Done(tmpTextBox)
    End Sub
 
    ''' <summary>
@@ -330,18 +385,6 @@ 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
 
@@ -352,18 +395,27 @@ Public Class InputExpanderVM
 #Region "METHODS"
 
    Friend Sub PrepareInputBox(PrepareInputBoxParam As PrepareInputBoxParam)
-      ' Divido il titolo che può contenere comandi dopo il ';'
-      Dim vsSplitTitle As String() = PrepareInputBoxParam.sTitle.Split(";"c)
-      Title = vsSplitTitle(0)
+      Title = PrepareInputBoxParam.sTitle
       If PrepareInputBoxParam.sLabel <> "" Then
          TextBlock = PrepareInputBoxParam.sLabel
          TextBox = ""
          TextVisibility = Visibility.Visible
-         ' 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
+         ' Controllo se il titolo è uguale a INFO se si
+         If Title = EgtMsg(5359).ToUpper() Then
+            ' Metto tmpbShow a false
+            m_tmpbShow = False
+            ' 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 InfoList
+            GetInfoList()
+            ' Rendo visibile il pulsante che mostra la lista delle info
+            ShowInfoItemVisibility = If(m_ComboItemsList.Count > 0, Visibility.Visible, Visibility.Collapsed)
          End If
       End If
       If PrepareInputBoxParam.sCheckLabel <> "" Then
@@ -371,9 +423,14 @@ Public Class InputExpanderVM
          CheckVisibility = Visibility.Visible
       End If
       If PrepareInputBoxParam.bShowCombo Then
-         m_bTempShow = PrepareInputBoxParam.bShowCombo
+         ' Assegno a tmpbShow PrepareInputBoxParam.bShowCombo
+         m_tmpbShow = PrepareInputBoxParam.bShowCombo
+         ' Pulisco la lista ComboItemsList
          ComboItemsList.Clear()
-         m_TempInfoList.Clear()
+         ' Pulisco la lista tmpInfoList
+         tmpInfoList.Clear()
+         ' Pulisco la lista InfoList
+         InfoList.Clear()
          ComboVisibility = Visibility.Visible
       End If
       If PrepareInputBoxParam.bShowBtn Then
@@ -391,6 +448,7 @@ Public Class InputExpanderVM
       ComboVisibility = Visibility.Collapsed
       ShowBtnVisibility = Visibility.Collapsed
       ShowInfoItemVisibility = Visibility.Collapsed
+      InfoVisibility = Visibility.Collapsed
       IsExpanded = False
       IsEnabled = False
    End Sub
@@ -426,21 +484,30 @@ Public Class InputExpanderVM
    End Function
 
    ''' <summary>
-   ''' Funzione che popola la lista ComboItemsList
+   ''' Rimovi nota da info lista
    ''' </summary>
-   Private Sub ComboInfo()
+   ''' <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)
+      ' Rendo visibile il pulsante per attivare la combo
+      ShowInfoItemVisibility = Visibility.Visible
+   End Sub
 
-      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))
+   Private Sub GetInfoList()
+      Dim tmpInfoList As String() = Nothing
+      Dim sKeyVal() As String = Nothing
+      Dim Index As Integer = 0
+      EgtGetAllInfo(Map.refManageLayerExpanderVM.m_nObjTreeOldId, tmpInfoList)
+      If Not IsNothing(tmpInfoList) Then
+         For Each ItemInfo As String In tmpInfoList
+            sKeyVal = ItemInfo.Trim().Split(New Char() {"="c})
+            InfoList.Add(New InfoItem(Index, sKeyVal(0), sKeyVal(1)))
+            Index += 1
          Next
       End If
    End Sub

OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb

@@ -19,12 +19,11 @@ 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
-            Map.refDrawOptionPanelVM.SetInfoRowIsExpanded(value)
+         If (value <> m_IsSelected) Then
+            m_IsSelected = value
             If value Then
                ' recupero l'Id del nuovo oggetto selezionato
                Map.refManageLayerExpanderVM.IsRightClickedLayerTreeItem(False)
@@ -104,6 +103,7 @@ Public Class LayerTreeViewItem
                EgtDraw()
             End If
          End If
+         Map.refProjectVM.EmitTitle()
       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="{Binding ManageLayerIsExpanded}" Style="{StaticResource ExpanderStyle}">
+   <Expander IsExpanded="True" Style="{StaticResource ExpanderStyle}">
       <Expander.Header>
          <StackPanel Orientation="Horizontal">
             <TextBlock Text="{Binding HeaderName}" Margin="0,0,5,0"/>
@@ -13,11 +13,7 @@
          </StackPanel>
       </Expander.Header>
 
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
+      <StackPanel>
 
          <UniformGrid Rows="1">
             <Button Content="{Binding NewPartMsg}" Command="{Binding NewPartCommand}"  Height="30"/>
@@ -25,7 +21,7 @@
             <Button Content="{Binding ColorMsg}" Command="{Binding LayerColorCommand}"  Height="30"/>
          </UniformGrid>
 
-         <TreeView Grid.Row="1" x:Name="LayerTreeView"
+         <TreeView x:Name="LayerTreeView" MinHeight="300" MaxHeight="400" 
                    ItemsSource="{Binding Path=LayerList}"
                    VirtualizingStackPanel.IsVirtualizing = "True"
                    VirtualizingStackPanel.VirtualizationMode = "Recycling">
@@ -120,6 +116,6 @@
                </ContextMenu>
             </TreeView.ContextMenu>
          </TreeView>
-      </Grid>
+      </StackPanel>
    </Expander>
 </UserControl>

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb

@@ -1,5 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports EgtUILib
+Imports EgtCAM5.IniFile
 
 Public Class ManageLayerExpanderVM
    Inherits ViewModelBase
@@ -29,6 +30,22 @@ Public Class ManageLayerExpanderVM
       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)
@@ -37,7 +54,6 @@ Public Class ManageLayerExpanderVM
       End Get
       Set(value As ObservableCollection(Of LayerTreeViewItem))
          m_LayerList = value
-         OnPropertyChanged("LayerList")
       End Set
    End Property
 
@@ -55,22 +71,6 @@ 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
@@ -131,22 +131,6 @@ Public Class ManageLayerExpanderVM
 
 #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"
@@ -156,7 +140,6 @@ 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
@@ -258,7 +241,6 @@ 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
 

OptionPanel/DrawOptionPanelV.xaml

@@ -1,29 +1,15 @@
 <UserControl x:Class="DrawOptionPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
 
-   <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>
+   <StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <!--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  Grid.Row="1" Content="{Binding InfoExpander}"/>
-      <GridSplitter x:Name="InfoGridSplitter" Grid.Row="1" Style="{StaticResource General_GridSplitter}"/>
+      <ContentPresenter Content="{Binding InfoExpander}"/>
       <!--ContentPresenter that contains the InputExpander-->
-      <ContentPresenter Grid.Row="2" Content="{Binding InputExpander}"/>
-   </Grid>
+      <ContentPresenter Content="{Binding InputExpander}"/>
+   </StackPanel>
 
-</UserControl>
+</UserControl>

OptionPanel/DrawOptionPanelV.xaml.vb

@@ -1,30 +1,7 @@
 Public Class DrawOptionPanelV
 
-   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
+   Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
+      Dim x = ciao.MaxHeight
    End Sub
 
 End Class

OptionPanel/DrawOptionPanelVM.vb

@@ -1,4 +1,4 @@
-Imports System.IO
+Imports EgtUILib
 
 Public Class DrawOptionPanelVM
    Inherits ViewModelBase
@@ -37,28 +37,6 @@ Public Class DrawOptionPanelVM
       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()
@@ -82,93 +60,4 @@ Public Class DrawOptionPanelVM
 
 #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

@@ -18,7 +18,6 @@ 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
@@ -139,7 +138,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) & "\" & Path.GetFileName( sEstFile), ".html")
+            sEstFile = Path.ChangeExtension(Path.GetDirectoryName(sCurrFilePath) & "\" & sEstFile, ".html")
          Else
             sEstFile = Path.ChangeExtension(sCurrFilePath, Nothing)
             If IniFile.m_bMachiningGroup Then

OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb

@@ -94,18 +94,26 @@ Public Class MachiningTreeExpanderVM
             ' Sposto la lavorazione aggiunta subito dopo quella appena selezionata
             EgtRelocate(MachiningId, nSelectedOperationId, GDB_POS.AFTER)
          End If
-         ' 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()
+         ' 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()
          End While
-         EgtSetMachiningGeometry(vId, vSub)
+         ' 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
          ' Calcolo la lavorazione con la nuova geometria
          EgtApplyMachining(True)
          EgtDraw()
@@ -144,8 +152,6 @@ Public Class MachiningTreeExpanderVM
             Return EgtMsg(MSG_MACHININGSDBPAGE + 12)
          Case MCH_MY.FIVEAXISMILLING
             Return EgtMsg(31213)
-         Case MCH_MY.PROBING
-            Return EgtMsg(31220)
          Case Else
             Return "Mach"
       End Select

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb

@@ -1,6 +1,4 @@
-Imports System.ComponentModel
-Imports System.Globalization
-Imports EgtUILib
+Imports EgtUILib
 
 Public Class DispositionParameterExpanderVM
    Inherits ViewModelBase
@@ -313,16 +311,12 @@ 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 è un punto X,Y"
+               m_InputErrorMsg = "Il valore non è una cordinata XY"
                OnPropertyChanged("InputErrorMsg")
                Return
             End If
@@ -335,44 +329,13 @@ Public Class DispositionParameterExpanderVM
                ' imposto il riferimento della tavola
                Dim ptTableRef As Point3d
                EgtGetTableRef(1, ptTableRef)
-               ' calcolo il punto del grezzo da posizionare nelle coordinate di input
+               ' calcolo il punto del grezzo da posizionar 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)
@@ -471,24 +434,8 @@ 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

@@ -322,11 +322,11 @@ Public NotInheritable Class DispositionUtility
                      Dim dFixtureHeight As Double = 0
                      EgtGetInfo(nFixtureId, "H", dFixtureHeight)
                      ' recupero altezza grezzo riferita alla tavola
-                     Dim ptRawPartMin As Point3d = bboxRawPart.Min
-                     ptRawPartMin.ToLoc(TableFrame)
+                     Dim dRawPartMin As Point3d = bboxRawPart.Min
+                     dRawPartMin.ToLoc(TableFrame)
                      ' se l'altezza grezzo è minore di quella della ventosa, lo sposto alla stessa altezza
-                     If ptRawPartMin.z < dFixtureHeight - EPS_SMALL Then
-                        Dim vtMove As New Vector3d(0, 0, dFixtureHeight - ptRawPartMin.z)
+                     If dRawPartMin.z < dFixtureHeight - EPS_SMALL Then
+                        Dim vtMove As New Vector3d(0, 0, dFixtureHeight - dRawPartMin.z)
                         EgtMoveRawPart(nRawPartId, vtMove)
                         ' ricalcolo il BBox del solido del grezzo per averlo aggiornato con la nuova Z
                         EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPart)
@@ -358,19 +358,19 @@ Public NotInheritable Class DispositionUtility
                         nOtherFixtureId = EgtGetNextFixture(nOtherFixtureId)
                      End While
                      ' recupero altezza grezzo riferita alla tavola
-                     Dim ptRawPartMin As Point3d = bboxRawPart.Min
-                     ptRawPartMin.ToLoc(TableFrame)
+                     Dim dRawPartMin As Point3d = bboxRawPart.Min
+                     dRawPartMin.ToLoc(TableFrame)
                      ' se non ci sono ventose sotto il grezzo
                      If Not bIsFixtureUnderRawPart Then
                         ' verifico che il grezzo sia ad altezza tavola
-                        If ptRawPartMin.z <> 0 Then
-                           Dim vtMove As New Vector3d(0, 0, -ptRawPartMin.z)
+                        If dRawPartMin.z <> 0 Then
+                           Dim vtMove As New Vector3d(0, 0, -dRawPartMin.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(ptRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
-                           Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - ptRawPartMin.z)
+                        If Math.Abs(dRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
+                           Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - dRawPartMin.z)
                            EgtMoveRawPart(nRawPartId, vtMove)
                         End If
                      End If
@@ -472,30 +472,23 @@ Public NotInheritable Class DispositionUtility
       ' Recupero il solido del grezzo
       Dim nMovedRawSolidId As Integer = EgtGetFirstNameInGroup(nRawId, RAWSOLID)
       ' definisco il box del solido del grezzo
-      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
+      Dim bboxRawPartId As New BBox3d
+      EgtGetBBoxGlob(nMovedRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPartId)
       ' 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 ptRawPartMin As Point3d = bboxRawPart.Min
-      ptRawPartMin.ToLoc(TableFrame)
+      Dim dRawPartMin As Point3d = bboxRawPartId.Min
+      dRawPartMin.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 bboxRawPart.OverlapsXY(bboxFixture) Then 
+         If bboxRawPartId.OverlapsXY(bboxFixture) Then 
             ' recupero il tipo di fixture         
             Dim nFxtType As FIX_TYPE = FixtureType(nFixtureId)
             ' Se è ventosa o morsa
@@ -508,22 +501,22 @@ Public NotInheritable Class DispositionUtility
                   dMaxFixtureHeight = dFixtureHeight
                End If
                ' se l'altezza grezzo è diversa da quella della ventosa, lo sposto alla stessa altezza
-               If ptRawPartMin.z < dFixtureHeight - EPS_SMALL Then
-                  Dim vtMove As New Vector3d(0, 0, dFixtureHeight - ptRawPartMin.z)
+               If dRawPartMin.z < dFixtureHeight - EPS_SMALL Then
+                  Dim vtMove As New Vector3d(0, 0, dFixtureHeight - dRawPartMin.z)
                   EgtMoveRawPart(nRawId, vtMove)
                   ' recupero il solido del grezzo
                   Dim nRawSolidId As Integer = EgtGetFirstNameInGroup(nRawId, RAWSOLID)
                   ' ricalcolo il BBox del solido del grezzo per averlo aggiornato con la nuova Z
-                  EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPart)
-                  ptRawPartMin = bboxRawPart.Min
-                  ptRawPartMin.ToLoc(TableFrame)
+                  EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPartId)
+                  dRawPartMin = bboxRawPartId.Min
+                  dRawPartMin.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, bboxRawPart.DimZ())
+               EgtSetFixtureMobile( nFixtureId, bboxRawPartId.DimZ())
             End If
             ' Se è un riferimento o una morsa
             If nFxtType = FIX_TYPE.REFERENCE Or nFxtType = FIX_TYPE.VISE Then
@@ -532,7 +525,7 @@ Public NotInheritable Class DispositionUtility
                ' calcolo bbox dell'arco di riferimento
                Dim bboxArcRef As New BBox3d
                EgtGetBBoxGlob(arcRefId, GDB_BB.STANDARD, bboxArcRef)
-               If bboxRawPart.OverlapsXY(bboxArcRef) Then
+               If bboxRawPartId.OverlapsXY(bboxArcRef) Then
                   ' recupero contorno del grezzo
                   Dim ccompoRawPartOutlineId As Integer = EgtGetFirstNameInGroup(nRawId, RAWOUTLINE)
                   'recupero il raggio dell'arco di riferimento
@@ -594,14 +587,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 ptRawPartMin.z <> 0 Then
-            Dim vtMove As New Vector3d(0, 0, -ptRawPartMin.z)
+         If dRawPartMin.z <> 0 Then
+            Dim vtMove As New Vector3d(0, 0, -dRawPartMin.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(ptRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
-            Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - ptRawPartMin.z)
+         If Math.Abs(dRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
+            Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - dRawPartMin.z)
             EgtMoveRawPart(nRawId, vtMove)
          End If
       End If

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml

@@ -238,11 +238,6 @@
                                  <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

@@ -226,11 +226,6 @@
                                  <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

@@ -1,4 +1,4 @@
-<UserControl x:Class="FiveAxisMachiningParameterExpanderV"
+<UserControl x:Class="FiveAxisMachinigParameterExpanderV"
              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"
@@ -216,11 +216,6 @@
                                  <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 FiveAxisMachiningParameterExpanderV
+Public Class FiveAxisMachinigParameterExpanderV
 
    Private m_RightTrayV As RightTrayV
    Private EgtFloatingPanel As EgtFloatingPanel

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml

@@ -216,11 +216,6 @@
                                  <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/MachiningParameterExpanderV.xaml

@@ -80,25 +80,28 @@
 
       <Button Name="ApplyMachBtn" Height="30" Content="{Binding UpdateMachiningBtnMsg}"
               Command="{Binding UpdateMachiningCommand}" Background="{Binding UpdateMachiningBtn_Background}"/>
-      <Grid Margin="0,2.5,0,2.5">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
-         <Button Command="{Binding PreviewMachiningTool_Command}"
-                 x:Name="ButtonPreview"
-                 Style="{StaticResource PreviewTool_Button}">
-            <Image Source="{Binding sToolPreview_Image}" Stretch="Uniform"/>
-         </Button>
+         <CheckBox Name="ViewToolBtn"
+                   Content="{Binding ViewToolBtnMsg}"
+                   IsChecked="{Binding ViewTool}"
+                   Style="{StaticResource ViewTool_CheckBox}"/>
 
-         <Slider Grid.Column="1" 
+         <Slider Grid.Row="1" 
                  x:Name="SliderV"
                  Value="{Binding SliderValue}"
-                 IsEnabled="{Binding Slider_IsEnable}"
+                 IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"
                  TickFrequency="{Binding SliderTick}"
                  Minimum="1"
                  Maximum="{Binding SliderScale}"
+                 IsSnapToTickEnabled="False"
                  Style="{StaticResource SliderValue_Slider}"/>
 
       </Grid>

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

@@ -1,5 +1,5 @@
-Imports EgtCAM5.MachiningParameterExpanderVM
-Imports EgtUILib
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Public Class MachiningParameterExpanderV
 
@@ -9,12 +9,9 @@ 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>
@@ -24,11 +21,4 @@ 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

@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.ComponentModel
+Imports System.Collections.ObjectModel
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class MachiningParameterExpanderVM
@@ -8,32 +10,6 @@ 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
@@ -78,6 +54,29 @@ 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("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
@@ -86,15 +85,15 @@ Public Class MachiningParameterExpanderVM
       End Get
    End Property
    Friend Sub SetSliderScale(value As Integer)
-      m_SliderScale = Math.Max(value, 1)
+      m_SliderScale = Math.Max( value, 1)
       If m_SliderScale <= 10 Then
          m_SliderTick = 1
       Else
-         m_SliderTick = CInt(m_SliderScale / 10)
+         m_SliderTick = CInt( m_SliderScale / 10)
       End If
-      NotifyPropertyChanged(NameOf(SliderScale))
-      NotifyPropertyChanged(NameOf(SliderTick))
-   End Sub
+      NotifyPropertyChanged( NameOf(SliderScale))
+      NotifyPropertyChanged( NameOf(SliderTick))
+   End Sub 
 
    Private m_SliderTick As Integer = 10
    Public ReadOnly Property SliderTick As Integer
@@ -110,7 +109,7 @@ Public Class MachiningParameterExpanderVM
          Return m_SliderValue
       End Get
       Set(value As Integer)
-         If m_nPreviewMachiningTool = MCH_LOOK.TAB_TOOL OrElse m_nPreviewMachiningTool = MCH_LOOK.TAB_HEAD Then
+         If m_bPreviewTool Then
             Dim nId As Integer = EgtPreviewMachiningTool(m_nPtEntId, value - m_SliderValue)
             If nId <> GDB_ID.NULL Then m_nPtEntId = nId
             EgtDraw()
@@ -119,7 +118,7 @@ Public Class MachiningParameterExpanderVM
       End Set
    End Property
    Friend Sub ResetSliderValue()
-      If m_nPreviewMachiningTool = MCH_LOOK.TAB_TOOL OrElse m_nPreviewMachiningTool = MCH_LOOK.TAB_HEAD Then
+      If m_bPreviewTool Then
          m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
       Else
          m_nPtEntId = GDB_ID.NULL
@@ -128,9 +127,8 @@ 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)
@@ -139,17 +137,6 @@ 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
@@ -165,9 +152,8 @@ Public Class MachiningParameterExpanderVM
    Dim StoneDrillParamExpanderV As StoneDrillingParameterExpanderV
    Dim SurfFinishParamExpanderV As SurfFinishingParameterExpanderV
    Dim WjParamExpanderV As WaterjettingParameterExpanderV
-   Dim FiveAxExpanderV As FiveAxisMachiningParameterExpanderV
+   Dim FiveAxExpanderV As FiveAxisMachinigParameterExpanderV
    Dim SurfRoughExpanderV As SurfRoughingParameterExpanderV
-   Dim ProbExpanderV As ProbingParameterExpanderV
 
    Private Sub Dummy()
 
@@ -206,7 +192,7 @@ Public Class MachiningParameterExpanderVM
 
          Select Case nType
             Case MCH_OY.DRILLING
-               If MatType = MaterialType.STONE5 Then
+               If MatType = MaterialType.STONE Then
                   If IsNothing(StoneDrillParamExpanderV) Then StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
                   StoneDrillParamExpanderV.DataContext = m_CurrOperation
                   Return StoneDrillParamExpanderV
@@ -216,7 +202,7 @@ Public Class MachiningParameterExpanderVM
                   Return WoodDrillParamExpanderV
                End If
             Case MCH_OY.SAWING
-               If MatType = MaterialType.STONE5 Then
+               If MatType = MaterialType.STONE Then
                   If IsNothing(StoneSawParamExpanderV) Then StoneSawParamExpanderV = New StoneSawingParameterExpanderV
                   StoneSawParamExpanderV.DataContext = m_CurrOperation
                   Return StoneSawParamExpanderV
@@ -230,7 +216,7 @@ Public Class MachiningParameterExpanderVM
                   If IsNothing(BeamMillParamExpanderV) Then BeamMillParamExpanderV = New BeamMillingParameterExpanderV
                   BeamMillParamExpanderV.DataContext = m_CurrOperation
                   Return BeamMillParamExpanderV
-               ElseIf MatType = MaterialType.STONE5 Then
+               ElseIf MatType = MaterialType.STONE Then
                   If IsNothing(StoneMillParamExpanderV) Then StoneMillParamExpanderV = New StoneMillingParameterExpanderV
                   StoneMillParamExpanderV.DataContext = m_CurrOperation
                   Return StoneMillParamExpanderV
@@ -248,7 +234,7 @@ Public Class MachiningParameterExpanderVM
                StoneSawFinishParamExpanderV.DataContext = m_CurrOperation
                Return StoneSawFinishParamExpanderV
             Case MCH_OY.POCKETING
-               If MatType = MaterialType.STONE5 Then
+               If MatType = MaterialType.STONE Or MatType = MaterialType.STONE5 Then
                   ' se macchina di tipo STONE ricavo il tipo di utensile
                   Dim sMachiningToolName = String.Empty
                   EgtMdbSetCurrMachining(sName)
@@ -284,17 +270,13 @@ Public Class MachiningParameterExpanderVM
                WjParamExpanderV.DataContext = m_CurrOperation
                Return WjParamExpanderV
             Case MCH_OY.FIVEAXISMILLING
-               If IsNothing(FiveAxExpanderV) Then FiveAxExpanderV = New FiveAxisMachiningParameterExpanderV
+               If IsNothing(FiveAxExpanderV) Then FiveAxExpanderV = New FiveAxisMachinigParameterExpanderV
                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()
@@ -332,8 +314,9 @@ Public Class MachiningParameterExpanderVM
 #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"
 
@@ -354,51 +337,6 @@ 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"
@@ -433,27 +371,76 @@ Public Class MachiningParameterExpanderVM
          Return
       End If
 
-      ' Verifico se forzato ricalcolo da interfaccia
-      Dim bRecalc As Boolean = ((Keyboard.Modifiers And ModifierKeys.Shift) <> 0)
+      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
 
-      ' Aggiorno parametri di lavorazione
+      ' La modifica di alcuni parametri forza il ricalcolo della geometria
+      Dim ModifiedGeometry As Boolean = m_CurrOperation.m_IsModifiedSelectedFaceUseType
+      ' aggiorno valori modificati
       m_CurrOperation.WriteOperationParam()
-
-      ' 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()
+      ' Carico tutta la geometria selezionata in una lista
+      Dim SelectedGeometry As New List(Of Integer)
+      Dim EntityIndex As Integer = EgtGetFirstSelectedObj()
+      While EntityIndex <> GDB_ID.NULL
+         SelectedGeometry.Add(EntityIndex)
+         EntityIndex = EgtGetNextSelectedObj()
       End While
-      EgtSetMachiningGeometry(vId, vSub)
-
-      ' Rigenero la lavorazione
-      If Not EgtApplyMachining(bRecalc) Then
+      ' 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
          If EgtGetLastMachMgrErrorId() <> 0 Then
             Dim sErr As String = EgtGetLastMachMgrErrorString()
             Dim sInfo As String = String.Empty
@@ -472,13 +459,9 @@ Public Class MachiningParameterExpanderVM
             Map.refStatusBarVM.NotifyStatusOutput("")
          End If
       End If
-
       ' Restart visualizzazione utensile
-      EgtPreparePreviewMachiningTool()
-      EgtChangePreviewMachiningToolShow(nPreviewMachiningTool)
-      SetSliderScale(EgtGetPreviewMachiningToolStepCount())
-      SetSlider_IsEnable(True)
-      ResetSliderValue()
+      SetSliderScale( EgtGetPreviewMachiningToolStepCount())
+      SetViewTool(True)
       IsModified(False)
       ErrorOnOperation(False)
       EgtDraw()
@@ -487,23 +470,6 @@ 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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml

@@ -234,11 +234,6 @@
                                  <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

@@ -243,11 +243,6 @@
                                  <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/ProbingParameterExpanderV.xaml

@@ -1,275 +0,0 @@
-<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

@@ -1,83 +0,0 @@
-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

@@ -215,11 +215,6 @@
                                  <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

@@ -219,11 +219,6 @@
                                  <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

@@ -213,11 +213,6 @@
                                  <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

@@ -124,10 +124,10 @@
                                                             ValidatesOnDataErrors=True}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
                <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtLinkTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=LeadLinkTypeList,
+                                       ParamCmBxList="{Binding Path=ExtLinkTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
+                                       ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </StackPanel>
          </Expander>
@@ -211,11 +211,6 @@
                                  <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

@@ -219,11 +219,6 @@
                                  <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

@@ -226,11 +226,6 @@
                                  <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/SurfRoughingParameterExpanderV.xaml

@@ -236,11 +236,6 @@
                                  <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/WaterjettingParameterExpanderV.xaml

@@ -201,11 +201,6 @@
                                  <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/WoodDrillingParameterExpanderV.xaml

@@ -220,11 +220,6 @@
                                  <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/WoodMillingParameterExpanderV.xaml

@@ -238,11 +238,6 @@
                                  <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/WoodSawingParameterExpanderV.xaml

@@ -228,11 +228,6 @@
                                  <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/OperationListBoxItem/DispositionOpListBoxItem.vb

@@ -5,54 +5,28 @@ Public Class DispositionOpListBoxItem
 
    Public Property StatusAll As Boolean?
       Get
-         ' Recupero gli indici delle operazioni della Disposizione corrente
-         Dim OpIndexes As List(Of Integer) = GetOpIndexes()
-         ' Ritorno il valore specificato in base agli stati delle operazioni di cui abbiamo raccolto gli indici
-         If OpIndexes.Count = 0 Then Return False
-         Dim bTemp As Boolean = DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(OpIndexes(0)), MachiningOpListBoxItem).Status
-         For OpInDispIndex = 1 To OpIndexes.Count - 1
-            If DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(OpIndexes(OpInDispIndex)), MachiningOpListBoxItem).Status <> bTemp Then Return Nothing
-         Next
-         Return bTemp
+         ' Ottieni gli indici delle operazioni e calcola il valore aggregato
+         Return GetUnifiedStatus(Function(item) item.Status)
       End Get
       Set(value As Boolean?)
-         ' Recupero gli indici delle operazioni della Disposizione corrente
-         Dim OpIndexes As List(Of Integer) = GetOpIndexes()
-         If OpIndexes.Count = 0 Then
-            NotifyPropertyChanged(NameOf(StatusAll))
-            Return
-         End If
-         For Each OpInDispIndex In OpIndexes
-            DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(OpInDispIndex), MachiningOpListBoxItem).Status = If(IsNothing(value), False, CBool(value))
-         Next
+         ' Aggiorna lo stato delle operazioni
+         UpdateAllStatus(value, Sub(item, val) item.Status = CBool(val))
+         NotifyPropertyChanged(NameOf(StatusAll))
       End Set
    End Property
 
    Public Property OnOffAll As Boolean?
       Get
-         Dim OpIndexes As List(Of Integer) = GetOpIndexes()
-         ' Ritorno il valore specificato in base agli stati delle operazioni di cui abbiamo raccolto gli indici
-         If OpIndexes.Count = 0 Then Return False
-         Dim bTemp As Boolean = DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(OpIndexes(0)), MachiningOpListBoxItem).OnOff
-         For OpInDispIndex = 1 To OpIndexes.Count - 1
-            If DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(OpIndexes(OpInDispIndex)), MachiningOpListBoxItem).OnOff <> bTemp Then Return Nothing
-         Next
-         Return bTemp
+         ' Ottieni gli indici delle operazioni e calcola il valore aggregato
+         Return GetUnifiedStatus(Function(item) item.OnOff)
       End Get
       Set(value As Boolean?)
-         ' Recupero gli indici delle operazioni della Disposizione corrente
-         Dim OpIndexes As List(Of Integer) = GetOpIndexes()
-         If OpIndexes.Count = 0 Then
-            NotifyPropertyChanged(NameOf(OnOffAll))
-            Return
-         End If
-         For Each OpInDispIndex In OpIndexes
-            DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(OpInDispIndex), MachiningOpListBoxItem).OnOff = If(IsNothing(value), False, CBool(value))
-         Next
+         ' Aggiorna lo stato delle operazioni
+         UpdateAllStatus(value, Sub(item, val) item.OnOff = val)
+         NotifyPropertyChanged(NameOf(OnOffAll))
       End Set
    End Property
 
-
    Private m_Image As String = String.Empty
    Public Property Image As String
       Get
@@ -78,6 +52,7 @@ Public Class DispositionOpListBoxItem
             Exit For
          End If
       Next
+
       ' Inserisco in una lista gli indici delle operazioni della Disposizione (a partire dunque dall'indice trovato)
       Dim OpIndexes As New List(Of Integer)()
       Dim OpIndex As Integer = DispIndex + 1
@@ -89,4 +64,28 @@ Public Class DispositionOpListBoxItem
       Return OpIndexes
    End Function
 
+   ' Metodo per calcolare il valore aggregato (Checked/Unchecked/Indeterminate)
+   Private Function GetUnifiedStatus(getStatus As Func(Of MachiningOpListBoxItem, Boolean?)) As Boolean?
+      Dim OpIndexes As List(Of Integer) = GetOpIndexes()
+      If OpIndexes.Count = 0 Then Return False
+
+      Dim firstStatus = getStatus(DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(OpIndexes(0)), MachiningOpListBoxItem))
+      For Each index In OpIndexes.Skip(1)
+         Dim currentStatus = getStatus(DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(index), MachiningOpListBoxItem))
+         If currentStatus <> firstStatus Then Return Nothing
+      Next
+      Return firstStatus
+   End Function
+
+   ' Metodo per aggiornare lo stato di tutte le operazioni
+   Private Sub UpdateAllStatus(value As Boolean?, updateStatus As Action(Of MachiningOpListBoxItem, Boolean?))
+      Dim OpIndexes As List(Of Integer) = GetOpIndexes()
+      If OpIndexes.Count = 0 Then Return
+
+      For Each index In OpIndexes
+         Dim item = DirectCast(Map.refOperationsListExpanderVM.OperationList.Item(index), MachiningOpListBoxItem)
+         updateStatus(item, If(IsNothing(value), False, CBool(value)))
+      Next
+   End Sub
+
 End Class

OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb

@@ -1,5 +1,4 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
+Imports EgtUILib
 
 Public Class MachiningOpListBoxItem
    Inherits OperationListBoxItem
@@ -27,11 +26,29 @@ Public Class MachiningOpListBoxItem
                   End If
                   OpIndex += 1
                Next
+
+               ' Se Operazione selezionata metto la lampadina in stato false
+               For Each tmpItem As MachiningOpListBoxItem In Map.refOperationsListExpanderVM.tmpOperationList
+                  If tmpItem.Id = Id Then
+                     If tmpItem.OnOff Then
+                        EgtSetStatus(tmpItem.Id, GDB_ST.OFF)
+                        tmpItem.m_bThreeState = False
+                        tmpItem.OnOff = False
+                        Exit For
+                     Else
+                        EgtSetStatus(tmpItem.Id, GDB_ST.ON_)
+                        tmpItem.OnOff = True
+                        Exit For
+                     End If
+                  End If
+               Next
+
                ' Notifico StatusAll per calcolare lo stato della CheckBox della Disposizione
                Map.refOperationsListExpanderVM.OperationList(DispIndex).NotifyPropertyChanged(NameOf(DispositionOpListBoxItem.StatusAll))
                EgtSetOperationMode(Id, m_Status)
                EgtDraw()
             End If
+            Map.refProjectVM.EmitTitle()
             NotifyPropertyChanged(NameOf(Status))
          End If
       End Set
@@ -100,10 +117,10 @@ Public Class MachiningOpListBoxItem
             RaiseEvent m_ModifyNameGetFocus()
             ' se esco da modifica
          End If
-         NotifyPropertyChanged("ModifiedName")
-         NotifyPropertyChanged("Name")
-         NotifyPropertyChanged("Name_Visibility")
-         NotifyPropertyChanged("ModifyName_Visibility")
+         NotifyPropertyChanged(NameOf(ModifiedName))
+         NotifyPropertyChanged(NameOf(Name))
+         NotifyPropertyChanged(NameOf(Name_Visibility))
+         NotifyPropertyChanged(NameOf(ModifyName_Visibility))
       End Set
    End Property
 
@@ -125,27 +142,31 @@ Public Class MachiningOpListBoxItem
       End Get
    End Property
 
-
-   Private m_bOnOff As Boolean = True
-   Public Property OnOff As Boolean
+   Public m_bThreeState As Boolean = False
+   Private m_bOnOff As Boolean? = True
+   Public Property OnOff As Boolean?
       Get
          Return m_bOnOff
       End Get
-      Set(value As Boolean)
-         If m_bOnOff <> value Then
-            m_bOnOff = value
-            Dim bOldEnMod As Boolean = EgtGetEnableModified()
-            EgtDisableModified()
-            ' se abilitato, eseguo operazione
-            Dim status As Integer = GDB_ST.OFF
-            If value Then
-               status = GDB_ST.ON_
-            End If
-            ModifyStatusLamp()
-            EgtSetStatus(Id, status)
-            If bOldEnMod Then EgtEnableModified()
-            EgtDraw()
+      Set(value As Boolean?)
+         ' Controllo se la lampadina è messa in stato Nothing e value e false
+         m_bOnOff = If(m_bThreeState AndAlso Not value, True, value)
+         Dim bOldEnMod As Boolean = EgtGetEnableModified()
+         EgtDisableModified()
+         ' se abilitato, eseguo operazione
+         Dim status As Integer = GDB_ST.OFF
+         ' Controllo se lo stato della lampadina è true o nullo
+         If m_bOnOff OrElse IsNothing(m_bOnOff) Then
+            status = GDB_ST.ON_
          End If
+         ' Modifica lo stato della checkbox all delle lampadine
+         ModifyStatusLamp()
+         ' Setto lo stato della lampadina
+         EgtSetStatus(Id, status)
+         If bOldEnMod Then EgtEnableModified()
+         If Map.refOperationsListExpanderVM.ForceDrawInIsSelected Then EgtDraw()
+         m_bThreeState = False
+         Map.refProjectVM.EmitTitle()
          NotifyPropertyChanged(NameOf(OnOff))
       End Set
    End Property
@@ -250,7 +271,7 @@ Public Class MachiningOpListBoxItem
             m_CloseModifyLostFocus = False
             MessageBox.Show(EgtMsg(MSG_OPERATION + 22), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Warning)
             m_IsActive_ModifyName = True
-            NotifyPropertyChanged("ModifyName_Visibility")
+            NotifyPropertyChanged(NameOf(ModifyName_Visibility))
             m_Spy = True
             Return
          End If

OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb

@@ -36,7 +36,7 @@ Public Class OperationListBoxItem
       Set(value As Boolean)
          If Not IsNothing(value) Then
 
-            Dim indexes As List(Of OperationListBoxItem) = New List(Of OperationListBoxItem)
+            Dim indexes As New List(Of OperationListBoxItem)
             Dim Count As Integer = 0
             For Each OperationListBoxItem In Map.refOperationsListExpanderVM.OperationList
                If OperationListBoxItem.IsSelected And OperationListBoxItem.Id <> m_Id Then
@@ -45,6 +45,23 @@ Public Class OperationListBoxItem
                End If
             Next
 
+            ' Se Operazione selezionata metto la lampadina in stato Nothing
+            For Each tmpItem As MachiningOpListBoxItem In Map.refOperationsListExpanderVM.tmpOperationList
+               If tmpItem.Id = Id Then
+                  If IsNothing(tmpItem.OnOff) Then
+                     EgtSetStatus(tmpItem.Id, GDB_ST.OFF)
+                     tmpItem.m_bThreeState = False
+                     tmpItem.OnOff = False
+                     Exit For
+                  ElseIf Not tmpitem.OnOff AndAlso Not m_IsSelected Then
+                     EgtSetStatus(tmpItem.Id, GDB_ST.SEL)
+                     tmpItem.OnOff = Nothing
+                     tmpItem.m_bThreeState = True
+                     Exit For
+                  End If
+               End If
+            Next
+
             If indexes.Count > 0 Then
                If EgtGetOperationPhase(Id) <> EgtGetOperationPhase(indexes(0).Id) Then
                   Return
@@ -72,7 +89,7 @@ Public Class OperationListBoxItem
 
                Map.refOperationsListExpanderVM.OnPropertyChanged("MoveUp_IsEnabled")
                Map.refOperationsListExpanderVM.OnPropertyChanged("MoveDown_IsEnabled")
-               NotifyPropertyChanged("IsSelected")
+               NotifyPropertyChanged(NameOf(IsSelected))
                ' Aggiorno visualizzazione
                If Map.refOperationsListExpanderVM.ForceDrawInIsSelected Then EgtDraw()
                Return
@@ -136,7 +153,7 @@ Public Class OperationListBoxItem
          Map.refOperationsListExpanderVM.OnPropertyChanged("DuplicateCmd_IsEnabled")
          Map.refOperationsListExpanderVM.OnPropertyChanged("MachToDb_IsEnabled")
          Map.refOperationsListExpanderVM.OnPropertyChanged("Rename_IsEnabled")
-         NotifyPropertyChanged("IsSelected")
+         NotifyPropertyChanged(NameOf(IsSelected))
       End Set
    End Property
 

OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb

@@ -1,4 +1,7 @@
-Imports EgtUILib
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class OperationParametersExpanderVM
    Inherits ViewModelBase
@@ -29,7 +32,6 @@ Public Class OperationParametersExpanderVM
          ' disattivo MTable e SpecialPanel se vado sulla modifica di una lavorazione
          Map.refDoorPanelVM.MTableIsEnabled(Not m_ParametersIsExpanded)
          Map.refSpecialPanelVM.SpecialPanelIsEnabled(Not m_ParametersIsExpanded)
-         Map.refMachiningOptionPanelVM.SetOperationsListRowIsExpanded(False)
       End Set
    End Property
 
@@ -175,15 +177,9 @@ Public Class OperationParametersExpanderVM
                Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomWaterJetting
             Case MCH_OY.FIVEAXISMILLING
                Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomFiveAxMilling
-            Case MCH_OY.PROBING
-               Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomProbing
          End Select
          ' Imposto visualizzazione utensile
-         Map.refMachiningParameterExpanderVM.SetPreviewMachiningTool(MCH_LOOK.TAB_TOOL)
-         Map.refMachiningParameterExpanderVM.SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
-         Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(True)
-         EgtPreparePreviewMachiningTool()
-         EgtDraw()
+         Map.refMachiningParameterExpanderVM.SetViewTool( True)
       End If
       OnPropertyChanged("ParametersIsExpanded")
       Return True
@@ -213,10 +209,7 @@ Public Class OperationParametersExpanderVM
          EgtDraw()
       Else
          ' Nascondo visualizzazione utensile
-         Map.refMachiningParameterExpanderVM.SetPreviewMachiningTool(MCH_LOOK.NONE)
-         Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False)
-         Map.refMachiningParameterExpanderVM.ResetSliderValue()
-         EgtRemovePreviewMachiningTool()
+         Map.refMachiningParameterExpanderVM.SetViewTool( False)
       End If
       ParametersExpanderName = String.Empty
       ' Disabilito la selezione delle lavorazioni

OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml

@@ -6,171 +6,173 @@
              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
-   <Expander Header="{Binding OperationListHeader}"
-             IsEnabled="{Binding OpersListViewIsEnabled}" 
-             IsExpanded="{Binding ListIsExpanded}" Name="OperationsListExpander"
-             Style="{StaticResource ExpanderStyle}">
-      <Expander.InputBindings>
-         <KeyBinding Key="Escape" Command="{Binding CancelOperationCommand}" CommandParameter="Escape"/>
-      </Expander.InputBindings>
+   <StackPanel Name="OperationsListExpanderViewStackPanel" IsEnabled="{Binding OpersListViewIsEnabled}">
 
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
+      <Expander Header="{Binding OperationListHeader}" IsExpanded="{Binding ListIsExpanded}" Name="OperationsListExpander"
+                Style="{StaticResource ExpanderStyle}">
+         <Expander.InputBindings>
+            <KeyBinding Key="Escape" Command="{Binding CancelOperationCommand}" CommandParameter="Escape"/>
+         </Expander.InputBindings>
 
-         <UniformGrid Rows="1">
-            <Button Content="{Binding NewMachiningBtnContent}" Command="{Binding NewMachiningCommand}"  Height="30"/>
-            <Button Content="{Binding NewPositioningBtnContent}" Command="{Binding NewPositioningCommand}"  Height="30"/>
-            <Button Content="{Binding CancelOperationBtnContent}" Command="{Binding CancelOperationCommand}"  Height="30"/>
-         </UniformGrid>
+         <StackPanel>
 
-         <ListBox Grid.Row="1"
-                  IsSynchronizedWithCurrentItem="False"     
-                  ItemsSource="{Binding OperationList}"
-                  x:Name="OperationList" IsEnabled="{Binding IsEnabledOperationList}" SelectionMode="Extended">
-            <ListBox.Resources>
-               <DataTemplate DataType="{x:Type EgtCAM5:MachiningOpListBoxItem}">
-                  <DataTemplate.Resources>
-                     <Style x:Key="LayoutRoot" TargetType="Grid"/>
-                  </DataTemplate.Resources>
-                  <Border Background="Transparent">
-                     <Border.InputBindings>
-                        <MouseBinding MouseAction="LeftDoubleClick"
-                                      Command="{Binding DataContext.OperationListDoubleClickCommand, RelativeSource={RelativeSource AncestorType={x:Type EgtCAM5:OperationsListExpanderV}}}"
-                                      CommandParameter="{Binding Id}"/>
-                     </Border.InputBindings>
-                     <Grid Style="{StaticResource LayoutRoot}">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="Auto"/>
-                           <ColumnDefinition Width="Auto"/>
-                           <ColumnDefinition Width="Auto"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <CheckBox IsChecked="{Binding Status}" Margin="0,0,5,0"/>
-                        <Image Source="{Binding Image}" Height="15" Margin="0,0,5,0"/>
-                        <ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}" Grid.Column="1" 
-                                      IsChecked="{Binding OnOff}" Visibility="{Binding IsHidden}" Focusable="True" Height="15" Width="15" Margin="0,0,5,0"/>
-
-                        <TextBlock Grid.Column="2" Text="{Binding Name}"
-                                   Visibility="{Binding Name_Visibility}" Margin="0,0,5,0"/>
-                        <TextBox Grid.Column="2" Text="{Binding ModifiedName, UpdateSourceTrigger=PropertyChanged}"
-                                 Width="150"
-                                 x:Name="Box"
-                                 Visibility="{Binding ModifyName_Visibility}" Margin="0,0,5,0">
-                           <!--IsVisibleChanged="MachiningOpListBoxItem_IsVisibleChanged"
+            <UniformGrid Rows="1">
+               <Button Content="{Binding NewMachiningBtnContent}" Command="{Binding NewMachiningCommand}"  Height="30"/>
+               <Button Content="{Binding NewPositioningBtnContent}" Command="{Binding NewPositioningCommand}"  Height="30"/>
+               <Button Content="{Binding CancelOperationBtnContent}" Command="{Binding CancelOperationCommand}"  Height="30"/>
+            </UniformGrid>
+            <ListBox IsSynchronizedWithCurrentItem="False" ItemsSource="{Binding OperationList}"
+                     Height="200" x:Name="OperationList" IsEnabled="{Binding IsEnabledOperationList}" SelectionMode="Extended">
+               <ListBox.Resources>
+                  <DataTemplate DataType="{x:Type EgtCAM5:MachiningOpListBoxItem}">
+                     <DataTemplate.Resources>
+                        <Style x:Key="LayoutRoot" TargetType="Grid">
+                           <!--<Style.Triggers>-->
+                           <!--these are the triggers that make the code cursor jump from box 1 to box 2 to box 3.-->
+                           <!--<DataTrigger Binding="{Binding ElementName=Box, Path=Visibility}" Value="Visible">
+                                 <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=Box}"/>
+                              </DataTrigger>
+                           </Style.Triggers>-->
+                        </Style>
+                     </DataTemplate.Resources>
+                     <Border Background="Transparent">
+                        <Border.InputBindings>
+                           <MouseBinding MouseAction="LeftDoubleClick"
+                                         Command="{Binding DataContext.OperationListDoubleClickCommand, RelativeSource={RelativeSource AncestorType={x:Type EgtCAM5:OperationsListExpanderV}}}"
+                                         CommandParameter="{Binding Id}"/>
+                        </Border.InputBindings>
+                        <Grid Style="{StaticResource LayoutRoot}">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="1*"/>
+                           </Grid.ColumnDefinitions>
+                           <CheckBox IsChecked="{Binding Status}" Margin="0,0,5,0"/>
+                           <Image Source="{Binding Image}" Height="15" Margin="0,0,5,0"/>
+                           <!--<ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}" Grid.Column="1" 
+                                         IsChecked="{Binding OnOff}" Visibility="{Binding IsHidden}" Focusable="True" Height="15" Width="15" Margin="0,0,5,0"/>-->
+                           <CheckBox Style="{StaticResource EgtCAM5_LampToggleButton}" Grid.Column="1" 
+                                     IsChecked="{Binding OnOff}" Height="15" Width="15" Margin="0,0,5,0"/>
+                           <TextBlock Grid.Column="2" Text="{Binding Name}"
+                                      Visibility="{Binding Name_Visibility}" Margin="0,0,5,0"/>
+                           <TextBox Grid.Column="2" Text="{Binding ModifiedName, UpdateSourceTrigger=PropertyChanged}"
+                                    Width="150"
+                                    x:Name="Box"
+                                    Visibility="{Binding ModifyName_Visibility}" Margin="0,0,5,0">
+                              <!--IsVisibleChanged="MachiningOpListBoxItem_IsVisibleChanged"
                                     LostKeyboardFocus="MachiningOpListBoxItem_LostKeyboardFocus">-->
-                           <TextBox.InputBindings>
-                              <KeyBinding Key="Enter" Command="{Binding ModifyNameEnterCommand}"/>
-                              <KeyBinding Key="Escape" Command="{Binding ModifyNameEscCommand}"/>
-                           </TextBox.InputBindings>
-                        </TextBox>
-                        <TextBlock Grid.Column="3" Text="{Binding Info}"/>
-                     </Grid>
-                  </Border>
-               </DataTemplate>
-               <DataTemplate DataType="{x:Type EgtCAM5:DispositionOpListBoxItem}">
-                  <Border CornerRadius="1" Background="{StaticResource EgaltechBlue3}">
-                     <Border.InputBindings>
-                        <MouseBinding MouseAction="LeftDoubleClick"
-                                      Command="{Binding DataContext.OperationListDoubleClickCommand, RelativeSource={RelativeSource AncestorType={x:Type EgtCAM5:OperationsListExpanderV}}}"
-                                      CommandParameter="{Binding Id}"/>
-                     </Border.InputBindings>
-                     <StackPanel Orientation="Horizontal">
-                        <CheckBox IsChecked="{Binding StatusAll}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                        <CheckBox IsChecked="{Binding OnOffAll}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                        <!--<ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}"
+                              <TextBox.InputBindings>
+                                 <KeyBinding Key="Enter" Command="{Binding ModifyNameEnterCommand}"/>
+                                 <KeyBinding Key="Escape" Command="{Binding ModifyNameEscCommand}"/>
+                              </TextBox.InputBindings>
+                           </TextBox>
+                           <TextBlock Grid.Column="3" Text="{Binding Info}"/>
+                        </Grid>
+                     </Border>
+                  </DataTemplate>
+                  <DataTemplate DataType="{x:Type EgtCAM5:DispositionOpListBoxItem}">
+                     <Border CornerRadius="1" Background="{StaticResource EgaltechBlue3}">
+                        <Border.InputBindings>
+                           <MouseBinding MouseAction="LeftDoubleClick"
+                                         Command="{Binding DataContext.OperationListDoubleClickCommand, RelativeSource={RelativeSource AncestorType={x:Type EgtCAM5:OperationsListExpanderV}}}"
+                                         CommandParameter="{Binding Id}"/>
+                        </Border.InputBindings>
+                        <StackPanel Orientation="Horizontal">
+                           <CheckBox IsChecked="{Binding StatusAll}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                           <CheckBox IsChecked="{Binding OnOffAll}" Style="{StaticResource EgtCAM5_LampToggleButton}" Height="15" Width="15" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                           <!--<ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}"
                                          IsChecked="{Binding OnOffAll}" Visibility="{Binding IsHidden}" Focusable="True" Height="15" Width="15" Margin="0,0,5,0"/>-->
-                        <Image Source="{Binding Image}" Height="15" Margin="0,0,5,0"/>
-                        <TextBlock Text="{Binding Name}" Foreground="White"
-                                   FontSize="15" FontWeight="SemiBold"/>
-                     </StackPanel>
-                  </Border>
-               </DataTemplate>
-            </ListBox.Resources>
-            <!--<ListBox.ItemsPanel>
-               <ItemsPanelTemplate>
-                  <StackPanel Orientation="Vertical"/>
-               </ItemsPanelTemplate>
-            </ListBox.ItemsPanel>-->
-            <!--<Interactivity:Interaction.Triggers>
+                           <Image Source="{Binding Image}" Height="15" Margin="0,0,5,0"/>
+                           <TextBlock Text="{Binding Name}" Foreground="White"
+                                      FontSize="15" FontWeight="SemiBold"/>
+                        </StackPanel>
+                     </Border>
+                  </DataTemplate>
+               </ListBox.Resources>
+               <ListBox.ItemsPanel>
+                  <ItemsPanelTemplate>
+                     <StackPanel Orientation="Vertical"/>
+                  </ItemsPanelTemplate>
+               </ListBox.ItemsPanel>
+               <!--<Interactivity:Interaction.Triggers>
                   <Interactivity:EventTrigger EventName="MouseDoubleClick">
                      <Interactivity:InvokeCommandAction Command="{Binding OperationListDoubleClickCommand}"/>
                   </Interactivity:EventTrigger>
                </Interactivity:Interaction.Triggers>-->
-            <!--<Interactivity:Interaction.Behaviors>
+               <!--<Interactivity:Interaction.Behaviors>
                   <EgtCAM5:ScrollIntoViewForListBox/>
                </Interactivity:Interaction.Behaviors>-->
-            <ListBox.InputBindings>
-               <KeyBinding Key="Delete" Command="{Binding CancelOperationCommand}"/>
-            </ListBox.InputBindings>
-            <ListBox.ItemContainerStyle>
-               <Style TargetType="ListBoxItem">
-                  <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                  <Setter Property="IsSelected" Value="{Binding IsSelected}" />
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                           <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                              <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                           </Border>
-                           <ControlTemplate.Triggers>
-                              <MultiTrigger>
-                                 <MultiTrigger.Conditions>
-                                    <Condition Property="Selector.IsSelectionActive" Value="False"/>
-                                    <Condition Property="IsSelected" Value="True"/>
-                                 </MultiTrigger.Conditions>
-                                 <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
-                                 <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
-                              </MultiTrigger>
-                              <MultiTrigger>
-                                 <MultiTrigger.Conditions>
-                                    <Condition Property="Selector.IsSelectionActive" Value="True"/>
-                                    <Condition Property="IsSelected" Value="True"/>
-                                 </MultiTrigger.Conditions>
-                                 <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
-                                 <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
-                              </MultiTrigger>
-                           </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </ListBox.ItemContainerStyle>
-            <ListBox.ContextMenu>
-               <ContextMenu>
-                  <MenuItem Header="{Binding DuplicateMachMsg}"
-                            Command="{Binding DuplicateMachCommand}"
-                            IsEnabled="{Binding DuplicateCmd_IsEnabled}">
-                  </MenuItem>
-                  <MenuItem Header="{Binding MachToDbMsg}" 
-                            Command="{Binding MachToDbCommand}"
-                            IsEnabled="{Binding MachToDb_IsEnabled}">
-                  </MenuItem>
-                  <MenuItem Header="{Binding RenameMsg}" 
-                            Command="{Binding RenameCommand}"
-                            IsEnabled="{Binding Rename_IsEnabled}">
-                  </MenuItem>
-               </ContextMenu>
-            </ListBox.ContextMenu>
-            <ListBox.Style>
-               <Style TargetType="ListBox">
-                  <EventSetter Event="SelectionChanged" Handler="ItemsControl_SelectionChanged"/>
-               </Style>
-            </ListBox.Style>
-         </ListBox>
+               <ListBox.InputBindings>
+                  <KeyBinding Key="Delete" Command="{Binding CancelOperationCommand}"/>
+               </ListBox.InputBindings>
+               <ListBox.ItemContainerStyle>
+                  <Style TargetType="ListBoxItem">
+                     <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                     <Setter Property="IsSelected" Value="{Binding IsSelected}" />
+                     <Setter Property="Template">
+                        <Setter.Value>
+                           <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                              <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                                 <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                              </Border>
+                              <ControlTemplate.Triggers>
+                                 <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                       <Condition Property="Selector.IsSelectionActive" Value="False"/>
+                                       <Condition Property="IsSelected" Value="True"/>
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
+                                    <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
+                                 </MultiTrigger>
+                                 <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                       <Condition Property="Selector.IsSelectionActive" Value="True"/>
+                                       <Condition Property="IsSelected" Value="True"/>
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
+                                    <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
+                                 </MultiTrigger>
+                              </ControlTemplate.Triggers>
+                           </ControlTemplate>
+                        </Setter.Value>
+                     </Setter>
+                  </Style>
+               </ListBox.ItemContainerStyle>
+               <ListBox.ContextMenu>
+                  <ContextMenu>
+                     <MenuItem Header="{Binding DuplicateMachMsg}"
+                               Command="{Binding DuplicateMachCommand}"
+                               IsEnabled="{Binding DuplicateCmd_IsEnabled}">
+                     </MenuItem>
+                     <MenuItem Header="{Binding MachToDbMsg}" 
+                               Command="{Binding MachToDbCommand}"
+                               IsEnabled="{Binding MachToDb_IsEnabled}">
+                     </MenuItem>
+                     <MenuItem Header="{Binding RenameMsg}" 
+                               Command="{Binding RenameCommand}"
+                               IsEnabled="{Binding Rename_IsEnabled}">
+                     </MenuItem>
+                  </ContextMenu>
+               </ListBox.ContextMenu>
+               <ListBox.Style>
+                  <Style TargetType="ListBox">
+                     <EventSetter Event="SelectionChanged" Handler="ItemsControl_SelectionChanged"/>
+                  </Style>
+               </ListBox.Style>
+            </ListBox>
 
-         <UniformGrid Grid.Row="2" Rows="1">
-            <Button Content="{Binding MoveUpMsg}" Command="{Binding MoveUpCommand}" Height="30" IsEnabled="{Binding MoveUp_IsEnabled}" />
-            <Button Content="{Binding MoveDownMsg}" Command="{Binding MoveDownCommand}" Height="30" IsEnabled="{Binding MoveDown_IsEnabled}"/>
-            <Button Content="{Binding UpdateMsg}" Command="{Binding UpdateCommand}" Height="30"/>
-            <Button Content="{Binding SetUpMsg}" Command="{Binding SetUpCommand}" Height="30"/>
-         </UniformGrid>
+            <UniformGrid Rows="1">
+               <Button Content="{Binding MoveUpMsg}" Command="{Binding MoveUpCommand}" Height="30" IsEnabled="{Binding MoveUp_IsEnabled}" />
+               <Button Content="{Binding MoveDownMsg}" Command="{Binding MoveDownCommand}" Height="30" IsEnabled="{Binding MoveDown_IsEnabled}"/>
+               <Button Content="{Binding UpdateMsg}" Command="{Binding UpdateCommand}" Height="30"/>
+               <Button Content="{Binding SetUpMsg}" Command="{Binding SetUpCommand}" Height="30"/>
+            </UniformGrid>
 
-      </Grid>
-   </Expander>
+         </StackPanel>
+      </Expander>
+
+   </StackPanel>
 
 </UserControl>

OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb

@@ -85,7 +85,6 @@ Public Class OperationsListExpanderVM
          If value <> m_ListIsExpanded Then
             Map.refMachiningOptionPanelVM.Set_IsExpanded(MachiningOptionPanelVM.MachiningOptionPanelExpander.OPERATIONLIST, value)
             SetStatusOnLamp()
-            Map.refMachiningOptionPanelVM.SetOperationsListRowIsExpanded(value)
          End If
       End Set
    End Property
@@ -470,11 +469,8 @@ Public Class OperationsListExpanderVM
          If EgtGetOperationType(selOperation.Id) <> MCH_OY.DISP Then
             Map.refMachiningParameterExpanderVM.SetSliderScale(EgtGetPreviewMachiningToolStepCount())
             Map.refMachiningParameterExpanderVM.ResetSliderValue()
-            EgtDraw()
          End If
       End If
-
-      Map.refMachiningOptionPanelVM.SetOperationsListRowIsExpanded(False)
    End Sub
 
 #End Region ' OperationListDoubleClickCommand
@@ -675,8 +671,7 @@ Public Class OperationsListExpanderVM
          If Not String.IsNullOrEmpty(sErr) Then
             MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Else
-            ' Errore nell'aggiornamento delle lavorazioni!
-            MessageBox.Show(EgtMsg(5346), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+            MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
          End If
       Else
          Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(MSG_OPERATION + 11))
@@ -1305,11 +1300,8 @@ Public Class OperationsListExpanderVM
       ' Annullo creazione nuova lavorazione
       If m_NewMachining Then EndNewMachining(GDB_ID.NULL)
       ' Disabilito visualizzazione utensile
-      If Not IsNothing(Map.refMachiningParameterExpanderVM) Then
-         Map.refMachiningParameterExpanderVM.SetPreviewMachiningTool(MCH_LOOK.NONE)
-         Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False)
-         Map.refMachiningParameterExpanderVM.ResetSliderValue()
-         EgtRemovePreviewMachiningTool()
+      If Not IsNothing(m_MachiningParameterExpander) Then
+         Map.refMachiningParameterExpanderVM.SetViewTool(False)
       End If
       ' Deseleziono le operazioni correnti per eliminare il mark
       For Each Operation In OperationList
@@ -1338,6 +1330,7 @@ Public Class StatusLamp
 
 #Region "FIELDS & PROPERTIES"
 
+   ' Id dell'operazione
    Private m_nId As Integer
    Public Property nId As Integer
       Get
@@ -1348,12 +1341,13 @@ Public Class StatusLamp
       End Set
    End Property
 
-   Private m_bStatusLamp As Boolean
-   Public Property bStatusLamp As Boolean
+   ' Stato della lampadina: vero, falso e nullo 
+   Private m_bStatusLamp As Boolean?
+   Public Property bStatusLamp As Boolean?
       Get
          Return m_bStatusLamp
       End Get
-      Set(value As Boolean)
+      Set(value? As Boolean)
          m_bStatusLamp = value
       End Set
    End Property
@@ -1362,38 +1356,50 @@ Public Class StatusLamp
 
 #Region "CONSTRUCTOR"
 
-   Sub New(nId As Integer, bStatusLamp As Boolean)
+   Sub New(nId As Integer, bStatusLamp As Boolean?)
       m_nId = nId
       m_bStatusLamp = bStatusLamp
    End Sub
 
    Sub New()
-
    End Sub
 
 #End Region    ' Constructor
 
 #Region "METHODS"
 
+   ''' <summary>
+   ''' Funzione che salva gli stati di tutte le lampadine delle operazioni
+   ''' </summary>
+   ''' <returns></returns>
    Public Function LoadStatusLamp() As ObservableCollection(Of StatusLamp)
-      Dim tmpStatusLampList As New ObservableCollection(Of StatusLamp)
-      For Each ItemOp As MachiningOpListBoxItem In Map.refOperationsListExpanderVM.tmpOperationList
-         tmpStatusLampList.Add(New StatusLamp(ItemOp.Id, ItemOp.OnOff))
-      Next
-      Return tmpStatusLampList
+      ' Utilizzo di LINQ per creare la lista in modo più conciso, carico gli stati delle lampadine per tenerli salvati
+      Return New ObservableCollection(Of StatusLamp)(Map.refOperationsListExpanderVM.tmpOperationList.Select(Function(ItemOp) New StatusLamp(ItemOp.Id, ItemOp.OnOff)))
    End Function
 
+   ''' <summary>
+   ''' Funzione che aggiorna lo stato delle lampadine delle operazioni
+   ''' </summary>
    Public Sub UpdateStatusLamp()
+      ' Verifica che tmpOperationList non sia nulla
+      If IsNothing(Map.refOperationsListExpanderVM.tmpOperationList) Then Return
+
       Dim tmpStatusLamp As StatusLamp
-      If Not IsNothing(Map.refOperationsListExpanderVM.tmpOperationList) Then
-         For Each ItemOp As MachiningOpListBoxItem In Map.refOperationsListExpanderVM.tmpOperationList
-            tmpStatusLamp = Map.refOperationsListExpanderVM.StatusLampList.FirstOrDefault(Function(x) x.nId = ItemOp.Id)
-            If Not tmpStatusLamp.bStatusLamp Then
-               EgtSetStatus(ItemOp.Id, GDB_ST.OFF)
-               ItemOp.OnOff = False
-            End If
-         Next
-      End If
+      For Each ItemOp As MachiningOpListBoxItem In Map.refOperationsListExpanderVM.tmpOperationList
+         ' Recuero lo stato della lampadina
+         tmpStatusLamp = Map.refOperationsListExpanderVM.StatusLampList.FirstOrDefault(Function(x) x.nId = ItemOp.Id)
+         ' Controllo se lo stato della lampadina è falso nella lista StatusLampList
+         If Not tmpStatusLamp.bStatusLamp Then
+            ' Rimetto lo stato della lampadina a falso nella OperationList
+            EgtSetStatus(ItemOp.Id, GDB_ST.OFF)
+            ItemOp.OnOff = False
+            ' Controllo se lo stato della lampadina è nullo nella lista StatusLampList
+         ElseIf IsNothing(tmpStatusLamp.bStatusLamp) Then
+            ' Rimetto lo stato della lampadina a nullo nella OperationList
+            EgtSetStatus(ItemOp.Id, GDB_ST.SEL)
+            ItemOp.OnOff = Nothing
+         End If
+      Next
    End Sub
 
 #End Region    ' Methods

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderV.xaml

@@ -51,14 +51,7 @@
                     <TextBlock Text="{Binding VMillMsg}" Margin="5,0,0,0"/>
                 </StackPanel>
 
-               <StackPanel Orientation="Horizontal" Visibility="{Binding Trace_Visibility}"
-                           IsEnabled="{Binding Trace_IsEnabled}" Margin="10,5,10,0">
-                  <CheckBox HorizontalAlignment="Left" VerticalAlignment="Center"
-                     IsChecked="{Binding TraceActive}"/>
-                  <TextBlock Text="{Binding TraceMsg}" Margin="5,0,0,0"/>
-               </StackPanel>
-
-            <Grid>
+                <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="1*"/>

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb

@@ -20,7 +20,6 @@ Public Class SimulationExpanderVM
             Map.refOperationsListExpanderVM.StatusLampList.Clear()
             Dim tmpStatusLamp As New StatusLamp()
             Map.refOperationsListExpanderVM.StatusLampList = tmpStatusLamp.LoadStatusLamp()
-            Map.refMachiningOptionPanelVM.SetOperationsListRowIsExpanded(False)
          End If
       End Set
    End Property
@@ -249,8 +248,7 @@ Public Class SimulationExpanderVM
       Dim SliderVal As Double = GetPrivateProfileDouble(S_SIMUL, K_SLIDERVAL, 10)
       SliderValue = SliderVal
       ' Gestione check VMill
-      If IsKeyEnabledVirtualMilling() And
-         EgtUILib.GetPrivateProfileInt(S_VMILL, K_VM_ENABLE, 0, m_sCurrMachIniFilePath) <> 0 Then
+      If IsKeyEnabledVirtualMilling() And EgtUILib.GetPrivateProfileInt(S_VMILL, K_VM_ENABLE, 0, m_sCurrMachIniFilePath) <> 0 Then
          VMill_Visibility = Visibility.Visible
          VMill_IsEnabled = True
          Dim bVal As Boolean
@@ -263,16 +261,6 @@ Public Class SimulationExpanderVM
          VMillActive = False
          EgtEnableModified()
       End If
-      ' Gestione check Trace
-      If IniFile.GetPrivateProfileInt(S_SIMUL, K_TRACEENABLE, 0) <> 0 And
-         EgtUILib.GetPrivateProfileInt(S_TOOLTRACE, K_TT_ENABLE, 0, m_sCurrMachIniFilePath) <> 0 Then
-         Trace_Visibility = Visibility.Visible
-         Trace_IsEnabled = True
-         If TraceActive Then TraceActive = True
-      Else
-         Trace_Visibility = Visibility.Collapsed
-         Trace_IsEnabled = False
-      End If
       ' Aggiorno visualizzazione dati macchina
       ShowCncData()
       StatusMsg = EgtMsg(MSG_SIMULATION + 14)   ' HOME
@@ -377,7 +365,7 @@ Public Class SimulationExpanderVM
             End If
          Else
             ' Per evitare di ciclare rapidissimamente e consumare inutilmente CPU
-            System.Threading.Thread.Sleep(5)
+            System.Threading.Thread.Sleep(4)
          End If
          ' Costringo ad aggiornare UI
          UpdateUI()
@@ -409,7 +397,6 @@ Public Class SimulationExpanderVM
             MachineAxisList(Index).IsReadOnlyAxesValue = True
          Next
       End If
-      Trace_IsEnabled = (value = MCH_SIM_ST.UI_PAUSE OrElse value = MCH_SIM_ST.UI_STOP)
       EgtSimSetUiStatus(GetStatus())
    End Sub
 
@@ -449,19 +436,18 @@ Public Class SimulationExpanderVM
          sInfo = "EgtCAM5 ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
       #End If
       If EgtGetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_NCNAME, sCncFile) AndAlso Not String.IsNullOrWhiteSpace(sCncFile) Then
-         sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & Path.GetFileName(sCncFile)
+         sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & sCncFile
       Else
          sCncFile = Path.ChangeExtension(sCurrFilePath, Nothing)
          If IniFile.m_bMachiningGroup Then
             Dim sMGrpName As String = String.Empty
             If EgtGetMachGroupName(EgtGetCurrMachGroup(), sMGrpName) Then
-               sCncFile &= "_" & sMGrpName
+               sCncFile &= "_" & sMGrpName & ".cnc"
                sInfo &= "-" & sMGrpName
             End If
+         Else
+            sCncFile &= ".cnc"
          End If
-         Dim sExt As String =  ".cnc"
-         EgtUILib.GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, sExt, sExt, IniFile.m_sCurrMachIniFilePath)
-         sCncFile = Path.ChangeExtension(sCncFile, sExt)
       End If
       Return True
    End Function
@@ -469,16 +455,16 @@ Public Class SimulationExpanderVM
    Friend Sub SimulationExpander_Update_CncData( nFlag As Integer)
       If Simulation_IsExpanded Then
          ShowCncData()
-         ' Se fermo per Collisione rilevata da script Lua o per altra richiesta
-         If nFlag = 11 Or nFlag = 12 Then
+         ' Se fermo per Collisione rilevata da script Lua
+         If nFlag = 11 Then
             ' Imposto stato Pausa
             SetSimulationStatus(MCH_SIM_ST.UI_PAUSE)
             StatusMsg = EgtMsg(MSG_SIMULATION + 11)   ' PAUSA
             ' Aggiornamenti per bottone Play/Pause
             SetShowPlay(True)
             NotifyPropertyChanged("PlayPauseImage")
-            ' Se fermo per Collisione, dichiaro di non arrestarsi alla successiva notifica di collisione
-            If nFlag = 11 Then m_bStopOnNextCollision = False
+            ' Dichiaro di non arrestarsi alla successiva notifica di collisione
+            m_bStopOnNextCollision = False
          End If
       End If
    End Sub

OptionPanel/MachiningOptionPanelV.xaml

@@ -1,37 +1,24 @@
 <UserControl x:Class="MachiningOptionPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
 
-   <Grid x:Name="MachiningGrid" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
-      <Grid.RowDefinitions>
-         <RowDefinition MinHeight="100" Height="400" MaxHeight="800" 
-                        EgtCAM5:MachiningOptionPanelVM.IsExpanded="{Binding OperationsListRowIsExpanded}"
-                        EgtCAM5:MachiningOptionPanelVM.TargetSplitter="{Binding ElementName=MachiningGridSplitter}"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
+   <StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <!--ContentPresenter that contains the OperationsListExpander-->
       <ContentPresenter Content="{Binding OperationsListExpander,Mode=OneWay}"/>
-      <GridSplitter Name="MachiningGridSplitter" Style="{StaticResource General_GridSplitter}"/>
       <!--ContentPresenter that contains the OperationParametersExpander-->
-      <ContentPresenter Grid.Row="1" Content="{Binding OperationParametersExpander,Mode=OneWay}"/>
+      <ContentPresenter Content="{Binding OperationParametersExpander,Mode=OneWay}"/>
       <!--ContentPresenter that contains the MachiningsTreeExpander-->
-      <ContentPresenter Grid.Row="2" Content="{Binding MachiningsTreeExpander}"/>
+      <ContentPresenter Content="{Binding MachiningsTreeExpander}"/>
       <!--ContentPresenter that contains the SimulationExpander-->
-      <ContentPresenter Grid.Row="3" Content="{Binding SimulationExpander}"/>
+      <ContentPresenter Content="{Binding SimulationExpander}"/>
       <!--ContentPresenter that contains the EstimationsExpander-->
-      <ContentPresenter Grid.Row="4" Content="{Binding EstimationsExpander}"/>
+      <ContentPresenter Content="{Binding EstimationsExpander}"/>
 
-      <Button Grid.Row="5" 
-              Content="{Binding GenerateMsg}" Height="30"
+      <Button Content="{Binding GenerateMsg}" Height="30"
               IsEnabled="{Binding GenerateIsEnabled}"
               Command="{Binding GenerateCommand}"/>
 
-    </Grid>
+    </StackPanel>
 
 </UserControl>

OptionPanel/MachiningOptionPanelV.xaml.vb

@@ -1,25 +1,7 @@
 Public Class MachiningOptionPanelV
 
-   Sub New()
-
-      ' This call is required by the designer.
-      InitializeComponent()
-
-      ' Add any initialization after the InitializeComponent() call.
-      Map.SetRefMachiningOptionPanelV(Me)
-
-      If Not IsActivePlugin() Then
-         AddHandler MachiningGrid.Loaded,
-            Sub()
-               DynamicGridModule.RestoreMachiningGridLayout(MachiningGrid, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_MACHINING_PLUGIN, DynamicGridModule.PROJECT_MACHINING))
-               MachiningGrid.UpdateLayout()
-            End Sub
-
-         AddHandler MachiningGridSplitter.DragCompleted,
-            Sub()
-               DynamicGridModule.SaveMachiningGridLayout(MachiningGrid, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_MACHINING_PLUGIN, DynamicGridModule.PROJECT_MACHINING))
-            End Sub
-      End If
+   Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
+      Dim x = ciao.MaxHeight
    End Sub
 
 End Class

OptionPanel/MachiningOptionPanelVM.vb

@@ -1,5 +1,4 @@
 Imports EgtUILib
-Imports System.IO
 
 Public Class MachiningOptionPanelVM
    Inherits ViewModelBase
@@ -133,17 +132,6 @@ Public Class MachiningOptionPanelVM
       End Get
    End Property
 
-   Private m_OperationsListRowIsExpanded As Boolean = True
-   Public ReadOnly Property OperationsListRowIsExpanded As Boolean
-      Get
-         Return m_OperationsListRowIsExpanded
-      End Get
-   End Property
-   Friend Sub SetOperationsListRowIsExpanded(value As Boolean)
-      m_OperationsListRowIsExpanded = value
-      OnPropertyChanged("OperationsListRowIsExpanded")
-   End Sub
-
 #Region "Messages"
 
    Public ReadOnly Property GenerateMsg As String
@@ -207,67 +195,4 @@ Public Class MachiningOptionPanelVM
 
 #End Region    ' COMMANDS
 
-#Region "DEPENCY PROPERTY"
-
-   Public Shared ReadOnly IsExpandedProperty As DependencyProperty =
-        DependencyProperty.RegisterAttached(
-            "IsExpanded",
-            GetType(Boolean),
-            GetType(MachiningOptionPanelVM),
-            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(MachiningOptionPanelVM),
-            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 = MachiningOptionPanelVM.GetTargetSplitter(row)
-      If Not IsNothing(splitter) Then
-         splitter.IsEnabled = isExpanded
-         splitter.Visibility = If(isExpanded, Visibility.Visible, Visibility.Collapsed)
-      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.RestoreMachiningGridLayout(Map.refMachiningOptionPanelV.MachiningGrid, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_MACHINING_PLUGIN, DynamicGridModule.PROJECT_MACHINING))
-            Map.refMachiningOptionPanelV.MachiningGrid.UpdateLayout()
-         Else
-            row.Height = New GridLength(350)
-         End If
-      End If
-   End Sub
-
-#End Region    ' Depency Property
-
 End Class

OptionPanel/OptionPanelV.xaml

@@ -1,6 +1,6 @@
 <EgtFloating:EgtFloatingPanel x:Class="OptionPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               TitleBarOrientation="Vertical"
                               Visibility="{Binding Panel_Visibility}">

OptionPanel/OptionPanelVM.vb

@@ -60,7 +60,6 @@ Public Class OptionPanelVM
          Map.refSimulationExpanderVM.Simulation_IsExpanded = False
          Map.refEstimationsExpanderVM.Estimation_IsExpanded = False
       End If
-      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.SetManageLayerIsExpanded(True)
       NotifyPropertyChanged("ModePanel")
    End Sub
 

OptionsWindow/OptionModule.vb

@@ -12,10 +12,8 @@ Friend Module OptionModule
    Friend m_GridColor As Color3d
    ' Flag per visualizzazione spessa delle linee
    Friend m_bThickLine As Boolean
-   ' Qualità di visualizzazione delle superfici
-   Friend m_ShowSurfQuality As SceneSurfQualityOpt
-   ' Tipo di visualizzazione delle Zmap
-   Friend m_nShowZmapType As Integer
+   ' Flag per visualizzazione smussata delle superfici
+   Friend m_bSmoothTriMesh As Boolean
 
    ' Colore di default in disegno
    Friend m_DefMaterialColor As Color3d
@@ -61,9 +59,7 @@ Friend Module OptionModule
    Friend m_SelGeomSurfRoughing As SceneSelModeOpt
    Friend m_SelGeomWaterJetting As SceneSelModeOpt
    Friend m_SelGeomFiveAxMilling As SceneSelModeOpt
-   Friend m_SelGeomProbing As SceneSelModeOpt
-   ' Qualità di calcolo del virtual milling
-   Friend m_VMillQuality As VMillSelTypeOpt
+   Friend m_SelVMillQuality As VMillSelTypeOpt
    ' Flag per aggiungere una nuova lavorazione alla fine della fase o subito dopo la lavorazione selezionata
    Friend m_bNewMachiningIsLastOne As Boolean
    ' Variabile che indica se usare lo script per calcolare automaticamente la disposizione quando si passa in lavorazione
@@ -74,9 +70,6 @@ Friend Module OptionModule
    Friend m_bBeamOn As Boolean
    Friend m_bWallOn As Boolean
    Friend m_bDoorsOn As Boolean
-   Friend m_bWindowOn As Boolean
-   Friend m_bTrimmingOn As Boolean
-   Friend m_bReversePostOn As Boolean
    Friend m_bGunstockOn As Boolean
 
    ' inizializzazione lettura variabili ad inizio programma
@@ -117,24 +110,13 @@ Friend Module OptionModule
       ' Inizializzo flag linee ingrossate
       m_bThickLine = (GetPrivateProfileInt(S_SCENE, K_LINEWIDTH, 1) <> 1)
       ' Inizializzo flag visualizzazione smussata delle superfici
-      Dim nSSQ As Integer = GetPrivateProfileInt(S_SCENE, K_SHOWSURFQUALITY, 0)
-      m_ShowSurfQuality = DirectCast( Math.Min( Math.Max( nSSQ, -2), 2), SceneSurfQualityOpt)
-      ' Inizializzo tipo di visualizzazione Zmap
-      m_nShowZmapType = GetPrivateProfileInt(S_SCENE, K_SHOWZMAP, 9)
+      m_bSmoothTriMesh = (GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
       ' Inizio colore di default in disegno
       Dim DefColor As New Color3d(0, 0, 0)
       GetPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
       m_DefMaterialColor = DefColor
       ' Inizializzo tolleranza geometrica
       m_dGeometryTolerance = GetPrivateProfileDouble(S_GEOMDB, K_SURFTMTOLER, 0.05)
-      ' Inizializzo stile corrente delle quotature
-      m_dExtLineLen = GetPrivateProfileDouble(S_DIMENSIONSTYLE, K_EXTLINELEN, 5)
-      m_dArrowLen = GetPrivateProfileDouble(S_DIMENSIONSTYLE, K_ARROWLEN, 5)
-      m_dTextDist = GetPrivateProfileDouble(S_DIMENSIONSTYLE, K_TEXTDIST, 2)
-      m_nLenIsMM = GetPrivateProfileInt(S_DIMENSIONSTYLE, K_LENISMM, 2)
-      m_nDecDigit = GetPrivateProfileInt(S_DIMENSIONSTYLE, K_DECDIGIT, -2)
-      m_sFont = "" : GetPrivateProfileStringUtf8(S_DIMENSIONSTYLE, K_DIMFONT, "ModernPropS.Nfe", m_sFont)
-      m_dTextHeight = GetPrivateProfileDouble(S_DIMENSIONSTYLE, K_TEXTHEIGHT, 2)
       ' Inizializzo variabili per import
       m_dDxfScaleFactor = GetPrivateProfileDouble(S_IMPORT, K_DXFSCALE, 1)
       m_dStlScaleFactor = GetPrivateProfileDouble(S_IMPORT, K_STLSCALE, 1)
@@ -172,12 +154,9 @@ Friend Module OptionModule
       m_SelGeomSurfRoughing = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
       Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMFIVEAXMILLING, -1)
       m_SelGeomFiveAxMilling = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
-      Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMPROBING, -1)
-      m_SelGeomProbing = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
+      Temp = GetPrivateProfileInt(S_MACH, K_SELVMILLQUALITY, 0)
+      m_SelVMillQuality = If(Temp < -2 Or Temp > 2, VMillSelTypeOpt.HIGHER, DirectCast(Temp, VMillSelTypeOpt))
       m_SelGeomWaterJetting = SceneSelModeOpt.PARTCURVES
-      ' Inizializzo qualità di virtual milling
-      Temp = GetPrivateProfileInt(S_MACH, K_VMILLQUALITY, 0)
-      m_VMillQuality = DirectCast(Math.Min( Math.Max( Temp, -2), 2), VMillSelTypeOpt)
       ' Inizializzo variabile che indica posizione nuova operazione di lavorazione
       m_bNewMachiningIsLastOne = (GetPrivateProfileInt(S_OPTIONS, K_NEWMACHININGISLASTONE, 0) <> 0)
       ' Inizializzo variabile che indica se usare script di disposizione
@@ -187,42 +166,9 @@ Friend Module OptionModule
       m_bBeamOn = (GetPrivateProfileInt(S_BEAM, K_BEAMENABLE, 0) <> 0) 
       m_bWallOn = (GetPrivateProfileInt(S_WALL, K_WALLENABLE, 0) <> 0) 
       m_bDoorsOn = (GetPrivateProfileInt(S_DOORS, K_DDFENABLE, 0) <> 0) 
-      m_bWindowOn = (GetPrivateProfileInt(S_WINDOW, K_WINDOWENABLE, 0) <> 0) 
-      m_bTrimmingOn = (GetPrivateProfileInt(S_TRIMMING, K_TRIMMINGENABLE, 0) <> 0) 
-      m_bReversePostOn = (GetPrivateProfileInt(S_REVERSEPOST, K_REVERSEPOSTENABLE, 0) <> 0) 
       m_bGunstockOn = (GetPrivateProfileInt(S_GUNSTOCK, K_GUNSTOCKENABLE, 0) <> 0) 
    End Sub
 
-   ' restituisco spessore linee
-   Friend Function GetLineWidth() As Integer
-      Return If( m_bThickLine, 2, 1)
-   End Function
-
-   ' imposto stato visualizzazione superfici
-   Friend Sub SetShowSurfQuality( bRedraw As Boolean)
-      Dim bSmoothTriMesh As Boolean = True
-      Dim dSrfBezShowTol As Double = 0.2
-      Select m_ShowSurfQuality
-          Case SceneSurfQualityOpt.LOWER
-             bSmoothTriMesh = False
-             dSrfBezShowTol = 4
-          Case SceneSurfQualityOpt.LOW
-             bSmoothTriMesh = False
-             dSrfBezShowTol = 1
-          Case SceneSurfQualityOpt.STANDARD
-             bSmoothTriMesh = True
-             dSrfBezShowTol = 0.2
-          Case SceneSurfQualityOpt.HIGH
-             bSmoothTriMesh = True
-             dSrfBezShowTol = 0.05
-          Case SceneSurfQualityOpt.HIGHER
-             bSmoothTriMesh = True
-             dSrfBezShowTol = 0.01
-      End Select
-      EgtSetShowTriaAdv(bSmoothTriMesh, false)
-      EgtSetShowSurfBezierTol(dSrfBezShowTol, bRedraw)
-   End Sub
-
 End Module
 
 ' Classe che identifica una lingua del programma con nome e path del file dei messaggi

OptionsWindow/OptionWindowV.xaml

@@ -9,12 +9,11 @@
                             WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
                             MinWidth="400" MinHeight="382"
-                            Width="400" Height="600"
+                            Width="400" Height="575"
                             CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
       <local:GeomTypeConverter x:Key="GeomTypeConverter"/>
-      <local:SceneSurfQualityOptConverter x:Key="SceneSurfQualityOptConverter"/>
       <local:VMillTypeConverter x:Key="VMillTypeConverter"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
@@ -66,17 +65,10 @@
                           Grid.Row="0" Margin="0,5,0,5"/>
                <CheckBox IsChecked="{Binding ThickLine}"
                           Grid.Column="1" Grid.Row="0" Margin="22,5,0,5" VerticalAlignment="Center"/>
-               <TextBlock Text="{Binding SceneSurfQualityMsg}" VerticalAlignment="Center"
+               <TextBlock Text="{Binding SmoothTriMeshMsg}" VerticalAlignment="Center"
                           Grid.Row="1" Margin="0,5,0,5"/>
-               <ComboBox ItemsSource="{Binding SceneSurfQualityOptList, Mode=OneWay}"
-                         SelectedItem="{Binding SelectedSceneSurfQualityOpt}"
-                         Grid.Column="1" Grid.Row="1" Height="25" Margin="0,5,0,5">
-                  <ComboBox.ItemTemplate>
-                     <DataTemplate>
-                        <TextBlock Text="{Binding Converter={StaticResource SceneSurfQualityOptConverter}}"/>
-                     </DataTemplate>
-                  </ComboBox.ItemTemplate>
-               </ComboBox>
+               <CheckBox IsChecked="{Binding SmoothTriMesh}"
+                          Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
             </Grid>
             <UniformGrid Columns="2"
                          Margin="0,0,0,5">
@@ -85,31 +77,7 @@
                          SelectedItem="{Binding SelectedTextFont}" Height="25"
                          Margin="10,5,0,0"/>
             </UniformGrid>
-            <GroupBox Header="ShowZmap"
-                      Visibility="{Binding ShowZmapVisibility}"
-                      Margin="0,0,0,5">
-               <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-                  <CheckBox IsChecked="{Binding ShowZmapSurf}"
-                            Content="Surfaces" FlowDirection="RightToLeft"
-                            Grid.Row="0" Grid.Column="0" Margin="5,5,10,5" VerticalAlignment="Center"/>
-                  <CheckBox IsChecked="{Binding ShowZmapLines}"
-                            Content="Lines" FlowDirection="RightToLeft"
-                            Grid.Row="0" Grid.Column="1" Margin="5,5,10,5" VerticalAlignment="Center"/>
-                  <CheckBox IsChecked="{Binding ShowZmapNormals}"
-                            Content="Normals" FlowDirection="RightToLeft"
-                            Grid.Row="0" Grid.Column="2" Margin="5,5,10,5" VerticalAlignment="Center"/>
-                  <CheckBox IsChecked="{Binding ShowZmapBiColor}"
-                            Content="BiColor" FlowDirection="RightToLeft"
-                            Grid.Row="0" Grid.Column="3" Margin="5,5,10,5" VerticalAlignment="Center"/>
-               </Grid>
-            </GroupBox>
-            <Grid Margin="5,100,5,5">
+            <Grid Margin="5,5,5,5">
                <Button Content="{Binding UpdateLicenceMsg}" Command="{Binding UpdateLicence_Command}"  Height="26" Margin="100,1"/>
             </Grid>
          </StackPanel>
@@ -281,15 +249,6 @@
                       Header="{Binding MachiningSelGeomMsg}"
                       Margin="5,5,5,0">
                <UniformGrid Columns="2">
-                  <TextBlock Text="{Binding GeomTypeProbingMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedProbingGeomType}" Height="25">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
                   <TextBlock Text="{Binding GeomTypeDrillingMsg}" VerticalAlignment="Center"/>
                   <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
                             SelectedItem="{Binding SelectedDrillingGeomType}" Height="25">
@@ -406,7 +365,7 @@
                <UniformGrid Columns="2" Grid.ColumnSpan="2" Margin="0,5,0,0">
                   <TextBlock Text="{Binding VMillQualityMsg}" VerticalAlignment="Center"/>
                   <ComboBox ItemsSource="{Binding VMillTypeList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedVMillQualityType}" Height="25">
+                            SelectedItem="{Binding SelectedVMillTypeType}" Height="25">
                      <ComboBox.ItemTemplate>
                         <DataTemplate>
                            <TextBlock Text="{Binding Converter={StaticResource VMillTypeConverter}}"/>
@@ -435,9 +394,9 @@
          <StackPanel>
             <Grid Margin="5,20,5,0">
                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="3*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="3*"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
                <Grid.RowDefinitions>
                   <RowDefinition Height="1*"/>
@@ -445,51 +404,33 @@
                   <RowDefinition Height="1*"/>
                   <RowDefinition Height="1*"/>
                   <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
-               <TextBlock Text="{Binding BeamMsg}"
-                          Grid.Row="0" Grid.Column="0" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding BeamOn}" IsEnabled="{Binding BeamEnabled}"
+               <TextBlock Text="{Binding SpecialMsg}"
+                          Grid.Row="0" Margin="0,5,0,5"/>
+               <CheckBox IsChecked="{Binding SpecialOn}"
                          Grid.Row="0" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
+               <TextBlock Text="{Binding BeamMsg}"
+                          Grid.Row="1" Grid.Column="0" Margin="0,5,0,5"/>
+               <CheckBox IsChecked="{Binding BeamOn}" IsEnabled="{Binding BeamEnabled}"
+                         Grid.Row="1" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
                <Button Content="{Binding UpdateMsg}" IsEnabled="{Binding BeamActive}"
                        Command="{Binding UpdateBeam_Command}"
-                       Grid.Row="0" Grid.Column="2" Height="26"/>
+                       Grid.Row="1" Grid.Column="2" Height="26"/>
                <TextBlock Text="{Binding WallMsg}"
-                          Grid.Row="1" Grid.Column="0" Margin="0,5,0,5"/>
+                          Grid.Row="2" Grid.Column="0" Margin="0,5,0,5"/>
                <CheckBox IsChecked="{Binding WallOn}" IsEnabled="{Binding WallEnabled}"
-                         Grid.Row="1" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
+                         Grid.Row="2" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
                <Button Content="{Binding UpdateMsg}" IsEnabled="{Binding WallActive}"
                        Command="{Binding UpdateWall_Command}"
-                       Grid.Row="1" Grid.Column="2" Height="26"/>
-               <TextBlock Text="{Binding DoorsMsg}" VerticalAlignment="Center"
-                          Grid.Row="2" Grid.Column="0" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding DoorsOn}" IsEnabled="{Binding DoorsEnabled}"
-                         Grid.Row="2" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
-               <Button Content="{Binding UpdateMsg}" IsEnabled="{Binding DoorsActive}"
-                       Command="{Binding UpdateDoors_Command}"
                        Grid.Row="2" Grid.Column="2" Height="26"/>
-               <TextBlock Text="{Binding WindowMsg}" VerticalAlignment="Center"
+               <TextBlock Text="{Binding DoorsMsg}" VerticalAlignment="Center"
                           Grid.Row="3" Grid.Column="0" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding WindowOn}" IsEnabled="{Binding WindowEnabled}"
+               <CheckBox IsChecked="{Binding DoorsOn}" IsEnabled="{Binding DoorsEnabled}"
                          Grid.Row="3" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
-               <TextBlock Text="{Binding TrimmingMsg}" VerticalAlignment="Center"
-                          Grid.Row="4" Grid.Column="0" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding TrimmingOn}" IsEnabled="{Binding TrimmingEnabled}"
-                         Grid.Row="4" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
-               <TextBlock Text="{Binding ReversePostMsg}" VerticalAlignment="Center"
-                          Grid.Row="5" Grid.Column="0" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding ReversePostOn}" IsEnabled="{Binding ReversePostEnabled}"
-                         Grid.Row="5" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
                <TextBlock Text="{Binding GunstockMsg}" VerticalAlignment="Center"
-                          Grid.Row="6" Grid.Column="0" Margin="0,5,0,5"/>
+                          Grid.Row="4" Grid.Column="0" Margin="0,5,0,5"/>
                <CheckBox IsChecked="{Binding GunstockOn}" IsEnabled="{Binding GunstockEnabled}"
-                         Grid.Row="6" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
-               <TextBlock Text="{Binding SpecialMsg}"
-                          Grid.Row="7" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding SpecialOn}"
-                         Grid.Row="7" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
+                         Grid.Row="4" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
             </Grid>
          </StackPanel>
       </TabItem>

OptionsWindow/OptionWindowVM.vb

@@ -34,13 +34,6 @@ Public Class OptionWindowVM
       End Get
    End Property
 
-   Private m_SceneSurfQualityOptList As ObservableCollection(Of SceneSurfQualityOpt) = New ObservableCollection(Of SceneSurfQualityOpt)({SceneSurfQualityOpt.LOWER, SceneSurfQualityOpt.LOW, SceneSurfQualityOpt.STANDARD, SceneSurfQualityOpt.HIGH, SceneSurfQualityOpt.HIGHER})
-   Public ReadOnly Property SceneSurfQualityOptList As ObservableCollection(Of SceneSurfQualityOpt)
-      Get
-         Return m_SceneSurfQualityOptList
-      End Get
-   End Property
-
    Private m_FontList As New ObservableCollection(Of String)
    Public ReadOnly Property FontList As ObservableCollection(Of String)
       Get
@@ -105,18 +98,6 @@ Public Class OptionWindowVM
       End Set
    End Property
 
-   Public Property SelectedSceneSurfQualityOpt As SceneSurfQualityOpt
-      Get
-         Return OptionModule.m_ShowSurfQuality
-      End Get
-      Set(value As SceneSurfQualityOpt)
-         If WritePrivateProfileString(S_SCENE, K_SHOWSURFQUALITY, CInt(value).ToString()) Then
-            OptionModule.m_ShowSurfQuality = value
-            OptionModule.SetShowSurfQuality( true)
-         End If
-      End Set
-   End Property
-
    Public Property SelectedMillingGeomType As SceneSelModeOpt
       Get
          Return OptionModule.m_SelGeomMilling
@@ -177,7 +158,8 @@ Public Class OptionWindowVM
          End If
       End Set
    End Property
-    Public Property SelectedGenGeomType As SceneSelModeOpt
+
+   Public Property SelectedGenGeomType As SceneSelModeOpt
       Get
          Return OptionModule.m_SelGeomGenMachining
       End Get
@@ -187,7 +169,8 @@ Public Class OptionWindowVM
          End If
       End Set
    End Property
-    Public Property SelectedSurfRoughGeomType As SceneSelModeOpt
+
+   Public Property SelectedSurfRoughGeomType As SceneSelModeOpt
       Get
          Return OptionModule.m_SelGeomSurfRoughing
       End Get
@@ -197,6 +180,7 @@ Public Class OptionWindowVM
          End If
       End Set
    End Property
+
    Public Property SelectedSurfFinishGeomType As SceneSelModeOpt
       Get
          Return OptionModule.m_SelGeomSurfFinishing
@@ -218,6 +202,7 @@ Public Class OptionWindowVM
    '      End If
    '   End Set
    'End Property
+
    Public Property SelectedFiveAxGeomType As SceneSelModeOpt
       Get
          Return OptionModule.m_SelGeomFiveAxMilling
@@ -228,24 +213,14 @@ Public Class OptionWindowVM
          End If
       End Set
    End Property
-   Public Property SelectedProbingGeomType As SceneSelModeOpt
-      Get
-         Return OptionModule.m_SelGeomProbing
-      End Get
-      Set(value As SceneSelModeOpt)
-         If WritePrivateProfileString(S_MACH, K_SELGEOMPROBING, CInt(value).ToString()) Then
-            OptionModule.m_SelGeomProbing = value
-         End If
-      End Set
-   End Property
 
-   Public Property SelectedVMillQualityType As VMillSelTypeOpt
+   Public Property SelectedVMillTypeType As VMillSelTypeOpt
       Get
-         Return OptionModule.m_VMillQuality
+         Return OptionModule.m_SelVMillQuality
       End Get
       Set(value As VMillSelTypeOpt)
-         If WritePrivateProfileString(S_MACH, K_VMILLQUALITY, CInt(value).ToString()) Then
-            OptionModule.m_VMillQuality = value
+         If WritePrivateProfileString(S_MACH, K_SELVMILLQUALITY, CInt(value).ToString()) Then
+            OptionModule.m_SelVMillQuality = value
          End If
       End Set
    End Property
@@ -326,10 +301,19 @@ Public Class OptionWindowVM
       End Get
       Set(value As Boolean)
          OptionModule.m_bThickLine = value
-         Dim nThickLine As Integer = OptionModule.GetLineWidth()
-         WritePrivateProfileString(S_SCENE, K_LINEWIDTH, nThickLine.ToString())
-         EgtSetLineAttribs(nThickLine)
-         EgtDraw()
+         WritePrivateProfileString(S_SCENE, K_LINEWIDTH, If(value, "2", "1"))
+         EgtSetLineAttribs(If(value, 2, 1))
+      End Set
+   End Property
+
+   Public Property SmoothTriMesh As Boolean
+      Get
+         Return OptionModule.m_bSmoothTriMesh
+      End Get
+      Set(value As Boolean)
+         OptionModule.m_bSmoothTriMesh = value
+         WritePrivateProfileString(S_SCENE, K_SHOWTRIAADV, If(value, "1", "0"))
+         EgtSetShowTriaAdv(value)
       End Set
    End Property
 
@@ -339,68 +323,13 @@ Public Class OptionWindowVM
       End Get
       Set(value As String)
          OptionModule.m_sFontText = value
-         EgtSetFont("", OptionModule.m_sFontText)
+         Dim sNfeDir As String = String.Empty
+         GetPrivateProfileString(S_GEOMDB, K_NFEFONTDIR, "", sNfeDir)
+         EgtSetFont(sNfeDir, OptionModule.m_sFontText)
          WritePrivateProfileString(S_GEOMDB, K_DEFAULTFONT, OptionModule.m_sFontText)
       End Set
    End Property
 
-   Public Property ShowZmapSurf As Boolean
-      Get
-         Return (( OptionModule.m_nShowZmapType And 1) <> 0)
-      End Get
-      Set(value As Boolean)
-         If value Then
-            OptionModule.m_nShowZmapType = ( OptionModule.m_nShowZmapType Or 1)
-         Else
-            OptionModule.m_nShowZmapType = ( OptionModule.m_nShowZmapType And Not 1)
-         End If
-         WritePrivateProfileString(S_SCENE, K_SHOWZMAP, OptionModule.m_nShowZmapType.ToString())
-         EgtSetShowZmap( OptionModule.m_nShowZmapType, True)
-      End Set
-   End Property
-   Public Property ShowZmapLines As Boolean
-      Get
-         Return (( OptionModule.m_nShowZmapType And 2) <> 0)
-      End Get
-      Set(value As Boolean)
-         If value Then
-            OptionModule.m_nShowZmapType = ( OptionModule.m_nShowZmapType Or 2)
-         Else
-            OptionModule.m_nShowZmapType = ( OptionModule.m_nShowZmapType And Not 2)
-         End If
-         WritePrivateProfileString(S_SCENE, K_SHOWZMAP, OptionModule.m_nShowZmapType.ToString())
-         EgtSetShowZmap( OptionModule.m_nShowZmapType, True)
-      End Set
-   End Property
-   Public Property ShowZmapNormals As Boolean
-      Get
-         Return (( OptionModule.m_nShowZmapType And 4) <> 0)
-      End Get
-      Set(value As Boolean)
-         If value Then
-            OptionModule.m_nShowZmapType = ( OptionModule.m_nShowZmapType Or 4)
-         Else
-            OptionModule.m_nShowZmapType = ( OptionModule.m_nShowZmapType And Not 4)
-         End If
-         WritePrivateProfileString(S_SCENE, K_SHOWZMAP, OptionModule.m_nShowZmapType.ToString())
-         EgtSetShowZmap( OptionModule.m_nShowZmapType, True)
-      End Set
-   End Property
-   Public Property ShowZmapBiColor As Boolean
-      Get
-         Return (( OptionModule.m_nShowZmapType And 8) <> 0)
-      End Get
-      Set(value As Boolean)
-         If value Then
-            OptionModule.m_nShowZmapType = ( OptionModule.m_nShowZmapType Or 8)
-         Else
-            OptionModule.m_nShowZmapType = ( OptionModule.m_nShowZmapType And Not 8)
-         End If
-         WritePrivateProfileString(S_SCENE, K_SHOWZMAP, OptionModule.m_nShowZmapType.ToString())
-         EgtSetShowZmap( OptionModule.m_nShowZmapType, True)
-      End Set
-   End Property
-
    Public Property DxfScaleFactor As String
       Get
          Return LenToString(OptionModule.m_dDxfScaleFactor, 5)
@@ -858,11 +787,6 @@ Public Class OptionWindowVM
          Return (IniFile.m_nKeyOptions And KEY_OPT.DOORS) <> 0
       End Get
    End Property
-   Public ReadOnly Property DoorsActive As Boolean
-      Get
-         Return IniFile.IsActiveDoors()
-      End Get
-   End Property
    Public Property DoorsOn As Boolean
       Get
          Return DoorsEnabled AndAlso OptionModule.m_bDoorsOn
@@ -873,51 +797,6 @@ Public Class OptionWindowVM
       End Set
    End Property
 
-   Public ReadOnly Property WindowEnabled As Boolean
-      Get
-         Return (IniFile.m_nKeyOptions And KEY_OPT.WINDOW) <> 0
-      End Get
-   End Property
-   Public Property WindowOn As Boolean
-      Get
-         Return OptionModule.m_bWindowOn
-      End Get
-      Set(value As Boolean)
-         OptionModule.m_bWindowOn = value
-         WritePrivateProfileString(S_WINDOW, K_WINDOWENABLE, If(value, "1", "0"))
-      End Set
-   End Property
-
-   Public ReadOnly Property TrimmingEnabled As Boolean
-      Get
-         Return (IniFile.m_nKeyOptions And KEY_OPT.TRIMMING) <> 0
-      End Get
-   End Property
-   Public Property TrimmingOn As Boolean
-      Get
-         Return OptionModule.m_bTrimmingOn
-      End Get
-      Set(value As Boolean)
-         OptionModule.m_bTrimmingOn = value
-         WritePrivateProfileString(S_TRIMMING, K_TRIMMINGENABLE, If(value, "1", "0"))
-      End Set
-   End Property
-
-   Public ReadOnly Property ReversePostEnabled As Boolean
-      Get
-         Return (IniFile.m_nKeyOptions And KEY_OPT.REVERSEPOST) <> 0
-      End Get
-   End Property
-   Public Property ReversePostOn As Boolean
-      Get
-         Return OptionModule.m_bReversePostOn
-      End Get
-      Set(value As Boolean)
-         OptionModule.m_bReversePostOn = value
-         WritePrivateProfileString(S_REVERSEPOST, K_REVERSEPOSTENABLE, If(value, "1", "0"))
-      End Set
-   End Property
-
    Public ReadOnly Property GunstockEnabled As Boolean
       Get
          Return (IniFile.m_nKeyOptions And KEY_OPT.GUNSTOCK) <> 0
@@ -945,7 +824,6 @@ Public Class OptionWindowVM
    Private m_cmdExportMachineCmd As ICommand
    Private m_cmdUpdateBeamCmd As ICommand
    Private m_cmdUpdateWallCmd As ICommand
-   Private m_cmdUpdateDoorsCmd As ICommand
 
 #Region "Messages"
 
@@ -991,9 +869,9 @@ Public Class OptionWindowVM
          Return EgtMsg(6536)                     ' Linee spesse
       End Get
    End Property
-   Public ReadOnly Property SceneSurfQualityMsg As String
+   Public ReadOnly Property SmoothTriMeshMsg As String
       Get
-         Return EgtMsg(6518)                     ' Qualità visualizzazione superfici
+         Return EgtMsg(6518)                     ' Superfici smussate
       End Get
    End Property
    Public ReadOnly Property UpdateLicenceMsg As String
@@ -1207,22 +1085,7 @@ Public Class OptionWindowVM
    End Property
    Public ReadOnly Property DoorsMsg As String
       Get
-         Return "Doors (" & Path.GetFileName( IniFile.m_sDoorsDirPath) & ")"
-      End Get
-   End Property
-   Public ReadOnly Property WindowMsg As String
-      Get
-         Return "Window"
-      End Get
-   End Property
-   Public ReadOnly Property TrimmingMsg As String
-      Get
-         Return "Trimming"
-      End Get
-   End Property
-   Public ReadOnly Property ReversePostMsg As String
-      Get
-         Return "ReversePost"
+         Return "Doors"
       End Get
    End Property
    Public ReadOnly Property GunstockMsg As String
@@ -1265,12 +1128,6 @@ Public Class OptionWindowVM
          Return EgtMsg(31212)
       End Get
    End Property
-   
-   Public ReadOnly Property GeomTypeProbingMsg As String
-      Get
-         Return EgtMsg(31220)
-      End Get
-   End Property
 
    Public ReadOnly Property VMillQualityMsg As String
       Get
@@ -1281,17 +1138,6 @@ Public Class OptionWindowVM
 
 #End Region
 
-#Region "Visibility"  
-
-   Public ReadOnly Property ShowZmapVisibility As Visibility
-      Get
-         Return If( (IniFile.m_nUserLevel > 5), Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-#End Region
-
-
 #Region "COMMANDS"
 
 #Region "TopSceneBackground"
@@ -1503,18 +1349,10 @@ Public Class OptionWindowVM
       Dim sMachDir As String = Path.Combine(IniFile.m_sMachinesRoot, sMachName)
       ' Preparo direttorio temporaneo
       Dim sTempDir As String = Path.Combine(IniFile.m_sMachinesRoot, "Temp")
-      Try
-         If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
-            My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-         End If
-         My.Computer.FileSystem.CreateDirectory(sTempDir)
-      Catch
-         ' Problemi di accesso al direttorio delle macchine
-         Dim sErr As String = EgtMsg(6564)
-         EgtOutLog(sErr & " (" & sTempDir & ")")
-         MessageBox.Show(sErr, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
-         Return
-      End Try
+      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+      End If
+      My.Computer.FileSystem.CreateDirectory(sTempDir)
       ' Unzip nel direttorio temporaneo
       Using zip As New Ionic.Zip.ZipFile(sMachZip)
          zip.ExtractAll(sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
@@ -1915,116 +1753,6 @@ Public Class OptionWindowVM
 
 #End Region ' UpdateWall
 
-
-#Region "UpdateDoors"
-   Public ReadOnly Property UpdateDoors_Command() As ICommand
-      Get
-         If m_cmdUpdateDoorsCmd Is Nothing Then
-            m_cmdUpdateDoorsCmd = New RelayCommand(AddressOf UpdateDoorsCmd)
-         End If
-         Return m_cmdUpdateDoorsCmd
-      End Get
-   End Property
-
-   Public Sub UpdateDoorsCmd()
-      ' Recupero la versione del programma in esecuzione
-      Dim sExeVer As String = IniFile.GetProgramVersion()
-      ' Verifico presenza di una precedente installazione del Doors (file Version.lua oppure Main.lua)
-      Dim sDoorsVer As String = ""
-      IniFile.GetSpecialLuaVersion(IniFile.m_sDoorsDirPath, sDoorsVer)
-      If String.IsNullOrEmpty(sDoorsVer) Then
-         If My.Computer.FileSystem.FileExists(Path.Combine(IniFile.m_sDoorsDirPath, "Main.lua")) AndAlso
-            My.Computer.FileSystem.FileExists(Path.Combine(IniFile.m_sDoorsDirPath, "Machining.lua")) Then
-            sDoorsVer = "2.6l9"
-         Else
-            ' Il modulo "{0}" non è stato trovato, impossibile aggiornare. - Avviso
-            Dim sOut As String = String.Format(EgtMsg(6555), "Doors")
-            MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-            ' Esco
-            Return
-         End If
-      End If
-      ' Apro dialogo per richiesta file zip del Doors
-      Dim DoorsDlg As New Microsoft.Win32.OpenFileDialog() With {
-         .DefaultExt = ".zip",
-         .Filter = "Doors (.zip)|*.zip",
-         .CheckFileExists = True,
-         .ValidateNames = True
-      }
-      If DoorsDlg.ShowDialog() <> True Then Return
-      Dim sDoorsZip As String = DoorsDlg.FileName
-      ' Preparo direttorio temporaneo
-      Dim sTempDir As String = Path.Combine(IniFile.m_sTempDir, "Doors")
-      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
-         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-      End If
-      My.Computer.FileSystem.CreateDirectory(sTempDir)
-      ' Unzip nel direttorio temporaneo
-      Using zip As New Ionic.Zip.ZipFile(sDoorsZip)
-         zip.ExtractAll(sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
-      End Using
-      ' Recupero i dati del nuovo Doors
-      Dim sNewName = ""
-      Dim sNewVer = ""
-      Dim sNewMinExe = ""
-      IniFile.GetSpecialLuaData(sTempDir, sNewName, sNewVer, sNewMinExe)
-      ' Verifico che sia veramente il Doors
-      If String.Compare(sNewName, "Doors") <> 0 Then
-         ' Il file zip non contiene il modulo "{0}". - Avviso
-         Dim sOut As String = String.Format(EgtMsg(6556), "Doors")
-         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-         ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-         Return
-      End If
-      ' Verifico la versione minima del programma
-      If String.Compare(sExeVer, sNewMinExe) < 0 Then
-         ' Il nuovo modulo "{0}" richiede un programma con versione minima {1}. - Avviso
-         Dim sOut As String = String.Format(EgtMsg(6557), "Doors", sNewMinExe)
-         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-         ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-         Return
-      End If
-      ' Verifico la versione del Doors e se più vecchia chiedo cosa fare
-      If String.Compare(sNewVer, sDoorsVer) < 0 Then
-         ' La versione del nuovo modulo "{0}" è più vecchia dell'attuale. Vuoi sovrascrivere lo stesso ?
-         Dim sOut As String = String.Format(EgtMsg(6558), "Doors")
-         If MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then
-            ' Rimuovo il direttorio temporaneo ed esco
-            My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-            Return
-         End If
-      End If
-      ' Faccio una copia di backup del Doors corrente
-      Dim sBackupDir As String = IniFile.m_sDoorsDirPath & ".old"
-      If My.Computer.FileSystem.DirectoryExists(sBackupDir) Then
-         My.Computer.FileSystem.DeleteDirectory(sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-      End If
-      Try
-         My.Computer.FileSystem.CopyDirectory(IniFile.m_sDoorsDirPath, sBackupDir, True)
-      Catch ex As Exception
-         ' L'aggiornamento del modulo "{0}" non è riuscito. - Errore
-         Dim sOut As String = String.Format(EgtMsg(6559), "Doors")
-         EgtOutLog(sOut)
-         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
-         ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-         Return
-      End Try
-      ' Installo il Doors
-      My.Computer.FileSystem.CopyDirectory(sTempDir, IniFile.m_sDoorsDirPath, True)
-      ' Rimuovo il direttorio temporaneo di installazione
-      My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-      ' Il modulo "{0}" è stata aggiornato con successo. - Info
-      Dim sOk As String = String.Format(EgtMsg(6560), "Doors")
-      EgtOutLog(sOk)
-      MessageBox.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK)
-   End Sub
-
-#End Region ' UpdateDoors
-
-
 #Region "CloseOptionsCommand"
 
    ''' <summary>
@@ -2109,46 +1837,21 @@ Public Class GeomTypeConverter
 
 End Class
 
-Public Class SceneSurfQualityOptConverter
-   Implements IValueConverter
-
-   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
-      Select Case CInt(value)
-         Case SceneSurfQualityOpt.LOWER
-            Return EgtMsg(31215)          ' Inferiore
-         Case SceneSurfQualityOpt.LOW
-            Return EgtMsg(31216)          ' Bassa
-         Case SceneSurfQualityOpt.STANDARD
-            Return EgtMsg(31217)          ' Media
-         Case SceneSurfQualityOpt.HIGH
-            Return EgtMsg(31218)          ' Alta
-         Case SceneSurfQualityOpt.HIGHER
-            Return EgtMsg(31219)          ' Superiore
-         Case Else
-            Return ""
-      End Select
-   End Function
-
-   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
-      Throw New NotImplementedException()
-   End Function
-End Class
-
 Public Class VMillTypeConverter
    Implements IValueConverter
 
    Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
       Select Case CInt(value)
          Case VMillSelTypeOpt.LOWER
-            Return EgtMsg(31215)          ' Inferiore
+            Return EgtMsg(31215)
          Case VMillSelTypeOpt.LOW
-            Return EgtMsg(31216)          ' Bassa
+            Return EgtMsg(31216)
          Case VMillSelTypeOpt.STANDARD
-            Return EgtMsg(31217)          ' Media
+            Return EgtMsg(31217)
          Case VMillSelTypeOpt.HIGH
-            Return EgtMsg(31218)          ' Alta
+            Return EgtMsg(31218)
          Case VMillSelTypeOpt.HIGHER
-            Return EgtMsg(31219)          ' Superiore
+            Return EgtMsg(31219)
          Case Else
             Return ""
       End Select
@@ -2157,4 +1860,4 @@ Public Class VMillTypeConverter
    Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
       Throw New NotImplementedException()
    End Function
-End Class
+End Class

PopUpGridPanel/PopUpGridPanelV.xaml

@@ -1,24 +1,24 @@
 <UserControl x:Class="PopUpGridPanelV"
-             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="#93D5F4" Orientation="Horizontal">
-      <Button Command="{Binding CPlaneViewCommand}" ToolTip="{Binding CPlaneViewToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="3,3,1,3">
+   <StackPanel Background="Transparent" Orientation="Horizontal">
+      <Button Command="{Binding CPlaneViewCommand}" ToolTip="{Binding CPlaneViewToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneInvertCommand}" ToolTip="{Binding CPlaneInvertToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,1,3">
+      <Button Command="{Binding CPlaneInvertCommand}" ToolTip="{Binding CPlaneInvertToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneInvert.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneRotateCommand}" ToolTip="{Binding CPlaneRotateToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,1,3">
+      <Button Command="{Binding CPlaneRotateCommand}" ToolTip="{Binding CPlaneRotateToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlane3PCommand}" ToolTip="{Binding CPlane3PointsToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,1,3">
+      <Button Command="{Binding CPlane3PCommand}" ToolTip="{Binding CPlane3PointsToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/Cplane3POINTS.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlanePerpObjCommand}" ToolTip="{Binding CPlanePerpCurveToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,1,3">
+      <Button Command="{Binding CPlanePerpObjCommand}" ToolTip="{Binding CPlanePerpCurveToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplanePERPCURVE.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneObjCommand}" ToolTip="{Binding CPlaneObjectToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,3,3">
+      <Button Command="{Binding CPlaneObjCommand}" ToolTip="{Binding CPlaneObjectToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
       </Button>
    </StackPanel>

PopUpViewPanel/PopUpViewPanelV.xaml

@@ -1,24 +1,24 @@
 <UserControl x:Class="PopUpViewPanelV"
-             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="#93D5F4" Orientation="Horizontal">
-      <Button ToolTip="{Binding ZoomInToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomInCommand}" Margin="3,3,1,3">
+   <StackPanel Background="Transparent" Orientation="Horizontal">
+      <Button ToolTip="{Binding ZoomInToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomInCommand}">
          <Image Source="/Resources/GridViewPanel/ZoomIn.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding ZoomOutToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomOutCommand}" Margin="1,3,1,3">
+      <Button ToolTip="{Binding ZoomOutToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomOutCommand}">
          <Image Source="/Resources/GridViewPanel/ZoomOut.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding ZoomSelToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomSelCommand}" Margin="1,3,1,3">
+      <Button ToolTip="{Binding ZoomSelToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomSelCommand}">
          <Image Source="/Resources/GridViewPanel/ZoomSel.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding LookFromIso_NEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNECommand}" Margin="1,3,1,3">
+      <Button ToolTip="{Binding LookFromIso_NEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNECommand}">
          <Image Source="/Resources/GridViewPanel/LookFromISO_NE.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding LookFromIso_NWToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNWCommand}" Margin="1,3,1,3">
+      <Button ToolTip="{Binding LookFromIso_NWToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNWCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromISO_NW.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding ViewToCPlaneToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ViewToCPlaneCommand}" Margin="1,3,3,3">
+      <Button ToolTip="{Binding ViewToCPlaneToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ViewToCPlaneCommand}">
          <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
       </Button>
    </StackPanel>

Project/ProjectV.xaml

@@ -13,7 +13,7 @@
    </ItemsControl.ItemsPanel>
    <ItemsControl.ItemContainerStyle>
       <Style>
-         <Setter Property="DockPanel.Dock" Value="{Binding}"/>
+         <Setter Property="DockPanel.Dock" Value="{Binding}" />
       </Style>
    </ItemsControl.ItemContainerStyle>
    

Project/ProjectV.xaml.vb

@@ -11,6 +11,13 @@ Public Class ProjectV
    Private Sub UserControl_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo riferimento a questa classe in Map
       Map.SetRefProjectV(Me)
+      'SpecialPanel.Visibility = Visibility.Collapsed
+      'BeamPanel.Visibility = Visibility.Collapsed
+      'WallPanel.Visibility = Visibility.Collapsed
+      'DoorsPanel.Visibility = Visibility.Collapsed
+      'GunStockPanel.Visibility = Visibility.Collapsed
+      'PrintingPanel.Visibility = Visibility.Collapsed
+      ' Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
    End Sub
 
    Private Sub UserControl_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded

Project/ProjectVM.vb

@@ -1,10 +1,8 @@
-Imports System.Globalization
-Imports System.IO
-Imports System.Windows.Forms.Integration
+Imports System.Windows.Forms.Integration
 Imports System.Windows.Interop
-Imports System.Windows.Threading
+Imports System.IO
+Imports System.Globalization
 Imports EgtUILib
-Imports EgtUILib.EgtInterface
 Imports EgtWPFLib5
 
 Public Class ProjectVM
@@ -59,15 +57,9 @@ Public Class ProjectVM
       End Get
    End Property
 
-   Private m_DynamicGrid As New Grid()
-   Public ReadOnly Property DynamicGrid As Grid
-      Get
-         Return m_DynamicGrid
-      End Get
-   End Property
+
 
 #End Region
-
 #Region "EGTUILIB FIELDS"
 
    Private m_bCPlaneTypePos As Boolean
@@ -87,17 +79,6 @@ Public Class ProjectVM
       TMDbParamVisibility.bFirst = True
       ' Inizializza i parametri della scena
       'InitializeEgtProject()
-
-      Dim m_TopTrayV As New TopTrayV
-      Dim m_LeftTrayV As New LeftTrayV
-      Dim m_RightTrayV As New RightTrayV
-      Dim m_BottomTrayV As New BottomTrayV
-      Dim m_SceneContentControlV As New SceneContentControlV
-
-      DynamicGridModule.CreateDynamicGrid()
-
-      Dim gridSplitter As GridSplitter = DynamicGridModule.CreateGridSplitter()
-
       ' aggiungo componenti interfaccia
       Dim bPlugin As Boolean = False
       Dim PluginDirNameList() As String = {}
@@ -124,17 +105,12 @@ Public Class ProjectVM
                Dim ConfigurationData As IPluginConfigData = Map.refMainWindowVM.GetConfigData(Of IPluginConfigData)(PluginName & ".ConfigurationData")
                If Not IsNothing(ConfigurationData) And ConfigurationData.ControlList.Count > 0 Then
                   For Each Element In ConfigurationData.ControlList
-                     PopolateGridWithPlugIn(m_TopTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
                      Select Case Element.Name
                         Case PLUGIN_RIGHT_TRAY
-                           'm_PanelList.Add(New RightTrayV)
-                           'aggiungo RightTrayV alla griglia
-                           m_DynamicGrid.Children.Add(m_RightTrayV)
+                           m_PanelList.Add(New RightTrayV)
                            Map.refOptionPanelVM.SetPanelViewState(Element.ViewPanelState)
                         Case PLUGIN_LEFT_TRAY
-                           'm_PanelList.Add(New LeftTrayV)
-                           ' aggiungo LeftTrayV alla griglia
-                           m_DynamicGrid.Children.Add(m_LeftTrayV)
+                           m_PanelList.Add(New LeftTrayV)
                         Case Else
                            m_PanelList.Add(Map.refMainWindowVM.GetControlByName(Of IPluginControl)(Element))
                      End Select
@@ -142,43 +118,17 @@ Public Class ProjectVM
                End If
             End If
          Next
-         'm_PanelList.Add(New BottomTrayV)
-         'm_PanelList.Add(New TopTrayV)
-         ' aggiungo gridSplitter alla griglia
-         m_DynamicGrid.Children.Add(gridSplitter)
-         ' aggiungo BottomTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_BottomTrayV)
-         ' aggiungo TopTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_TopTrayV)
+         m_PanelList.Add(New BottomTrayV)
+         m_PanelList.Add(New TopTrayV)
          ' nascondo tasti gestione progetto se attivo plugin
          Map.refTopCommandBarVM.SetProjectManagerVisibility(False)
       Else
-         'm_PanelList.Add(New TopTrayV)
-         'm_PanelList.Add(New LeftTrayV)
-         'm_PanelList.Add(New RightTrayV)
-         'm_PanelList.Add(New BottomTrayV)
-         DynamicGridModule.PopulateGrid(m_TopTrayV, m_LeftTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
-         ' aggiungo TopTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_TopTrayV)
-         ' aggiungo LeftTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_LeftTrayV)
-         ' aggiungo gridSplitter alla griglia
-         m_DynamicGrid.Children.Add(gridSplitter)
-         ' aggiungo RightTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_RightTrayV)
-         ' aggiungo BottomTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_BottomTrayV)
+         m_PanelList.Add(New TopTrayV)
+         m_PanelList.Add(New LeftTrayV)
+         m_PanelList.Add(New RightTrayV)
+         m_PanelList.Add(New BottomTrayV)
       End If
-      'm_PanelList.Add(New SceneContentControlV)
-      ' aggiungo SceneContentControlV alla griglia
-      m_DynamicGrid.Children.Add(m_SceneContentControlV)
-      ' Carico le dimensioni salvate su ini se presenti
-      AddHandler m_DynamicGrid.Loaded,
-         Sub()
-            DynamicGridModule.RestoreGridLayout(If(IsActivePlugin(), DynamicGridModule.PROJECT_EGTCAM5_PLUGIN, DynamicGridModule.PROJECT_EGTCAM5))
-            m_DynamicGrid.UpdateLayout()
-         End Sub
-      m_PanelList.Add(m_DynamicGrid)
+      m_PanelList.Add(New SceneContentControlV)
    End Sub
 
 #End Region
@@ -262,27 +212,6 @@ Public Class ProjectVM
             Dim sOut As String = "Doors ver. " & sVersion & "   " & IniFile.m_sDoorsDirPath
             EgtOutLog(sOut)
          End If
-         If IniFile.IsActiveWindow() Then
-            bExtensions = True
-            Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion(IniFile.m_sWindowDirPath, sVersion)
-            Dim sOut As String = "Window ver. " & sVersion & "   " & IniFile.m_sWindowDirPath
-            EgtOutLog(sOut)
-         End If
-         If IniFile.IsActiveTrimming() Then
-            bExtensions = True
-            Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion(IniFile.m_sTrimmingDirPath, sVersion)
-            Dim sOut As String = "Trimming ver. " & sVersion & "   " & IniFile.m_sTrimmingDirPath
-            EgtOutLog(sOut)
-         End If
-         If IniFile.IsActiveReversePost() Then
-            bExtensions = True
-            Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion(IniFile.m_sReversePostDirPath, sVersion)
-            Dim sOut As String = "ReversePost ver. " & sVersion & "   " & IniFile.m_sReversePostDirPath
-            EgtOutLog(sOut)
-         End If
          If IniFile.IsActiveGunStock() Then
             bExtensions = True
             Dim sVersion As String = "---"
@@ -365,9 +294,19 @@ Public Class ProjectVM
 
    Private Sub PreInitializeScene()
       ' imposto colore di default
-      m_ProjectScene.SetDefaultMaterial(OptionModule.m_DefMaterialColor)
+      Dim DefColor As New Color3d(0, 0, 0)
+      GetPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
+      m_ProjectScene.SetDefaultMaterial(DefColor)
       ' imposto colori sfondo
-      m_ProjectScene.SetViewBackground(OptionModule.m_TopSceneBackground, OptionModule.m_BotSceneBackground)
+      Dim BackTopColor As New Color3d(192, 192, 192)
+      GetPrivateProfileColor(S_SCENE, K_BACKTOP, BackTopColor)
+      Dim BackBotColor As New Color3d(BackTopColor)
+      GetPrivateProfileColor(S_SCENE, K_BACKBOTTOM, BackBotColor)
+      m_ProjectScene.SetViewBackground(BackTopColor, BackBotColor)
+      ' imposto spessore linee
+      Dim nLineWidth As Integer = 1
+      nLineWidth = GetPrivateProfileInt(S_SCENE, K_LINEWIDTH, nLineWidth)
+      m_ProjectScene.SetLineWidth(nLineWidth)
       ' imposto colori di evidenziazione
       Dim MarkColor As New Color3d(255, 255, 0)
       GetPrivateProfileColor(S_SCENE, K_MARK, MarkColor)
@@ -431,21 +370,27 @@ Public Class ProjectVM
       ' modo di visualizzazione
       Dim nShowMode As Integer = GetPrivateProfileInt(S_SCENE, K_SHOWMODE, SM.SHADING)
       Map.refShowPanelVM.ShowModeState(nShowMode)
-      ' imposto spessore curve
-      EgtSetLineAttribs(OptionModule.GetLineWidth())
       ' visualizzazione direzione curve
       Dim nShowCurveDir As Integer = GetPrivateProfileInt(S_SCENE, K_CURVEDIR, 0)
       Map.refShowPanelVM.ShowCurveDir(nShowCurveDir)
-      ' qualità di visualizzazione delle superfici
-      OptionModule.SetShowSurfQuality(False)
+      ' visualizzazione avanzata dei triangoli costituenti le superfici
+      Dim bShowTriaAdv As Boolean = (GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
+      EgtSetShowTriaAdv(bShowTriaAdv)
       ' tipo visualizzazione per Zmap
-      EgtSetShowZmap(OptionModule.m_nShowZmapType, False)
+      Dim nShowZmap As Integer = GetPrivateProfileInt(S_SCENE, K_SHOWZMAP, 1)
+      EgtSetShowZmap(nShowZmap, False)
       ' dimensione lineare max in pixel delle textures
       Dim nTxrMaxLinPix As Integer = GetPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096)
       EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
       ' stile corrente delle quotature
-      EgtSetCurrDimensionStyle(OptionModule.m_dExtLineLen, OptionModule.m_dArrowLen, OptionModule.m_dTextDist,
-                               OptionModule.m_nLenIsMM, OptionModule.m_nDecDigit, OptionModule.m_sFont, OptionModule.m_dTextHeight)
+      OptionModule.m_dExtLineLen = GetPrivateProfileDouble(S_DIMENSIONSTYLE, K_EXTLINELEN, 5)
+      OptionModule.m_dArrowLen = GetPrivateProfileDouble(S_DIMENSIONSTYLE, K_ARROWLEN, 5)
+      OptionModule.m_dTextDist = GetPrivateProfileDouble(S_DIMENSIONSTYLE, K_TEXTDIST, 2)
+      OptionModule.m_nLenIsMM = GetPrivateProfileInt(S_DIMENSIONSTYLE, K_LENISMM, 2)
+      OptionModule.m_nDecDigit = GetPrivateProfileInt(S_DIMENSIONSTYLE, K_DECDIGIT, -2)
+      OptionModule.m_sFont = "" : GetPrivateProfileStringUtf8(S_DIMENSIONSTYLE, K_DIMFONT, "ModernPropS.Nfe", m_sFont)
+      OptionModule.m_dTextHeight = GetPrivateProfileDouble(S_DIMENSIONSTYLE, K_TEXTHEIGHT, 2)
+      EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight)
       ' lettura da ini della variabile che abilita i gruppi di lavorazione
       IniFile.m_bMachiningGroup = (GetPrivateProfileInt(S_MACH, K_MACHININGGROUP, 0) <> 0)
       Map.refTopCommandBarVM.DrawMode_IsChecked()
@@ -488,7 +433,7 @@ Public Class ProjectVM
          Dim nFlag As Integer = 1
          If Environment.GetCommandLineArgs.Count() > 4 Then Integer.TryParse(Environment.GetCommandLineArgs(4), nFlag)
          ' Modalità cieco con valori 0, 3 e 4
-         Return (nFlag <> 0 And nFlag <> 3 And nFlag <> 4 And nFlag <> 8)
+         Return (nFlag <> 0 And nFlag <> 3 And nFlag <> 4)
       End If
       If sExt = ".ddf" And Environment.GetCommandLineArgs.Count() > 2 Then
          ' Flag
@@ -652,7 +597,7 @@ Public Class ProjectVM
             bOk = ExecWall(sFile, sMachine, nFlag, False)
          End If
          ' Se richiesta uscita immediata
-         If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Or nFlag = 8 Then
+         If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Then
             Map.refMachinePanelVM.SaveCurrentMachine()
             Map.refMainWindowVM.CloseApplicationCmd()
             ' Altrimenti se errore
@@ -1184,7 +1129,7 @@ Public Class ProjectVM
                   EgtGetPlaneSnapPoint(e.Location, Vector3d.Z_AX, TableRef.z, ptCurr)
                   DispositionUtility.VtHookFinder(nFixtureId, ptCurr)
                   Exit While
-               ElseIf DispositionUtility.VerifyTableAxis(nFixtureId) Then
+               ElseIf DispositionUtility.VerifyTableAxis( nFixtureId) Then
                   m_SelType = DispositionUtility.SelType.BARS
                   m_nIdToSel = nFixtureId
                   ' Drag possibile
@@ -1282,7 +1227,7 @@ Public Class ProjectVM
                m_nIdToDesel = GDB_ID.NULL
                EgtDraw()
                Return
-               ' altrimenti verifico il tipo del primo oggetto selezionato
+            ' altrimenti verifico il tipo del primo oggetto selezionato
             Else
                Dim nFirstSelId As Integer = EgtGetFirstSelectedObj()
                ' se è un riferimento resetto lo stato di selezione ed esco
@@ -1381,29 +1326,18 @@ Public Class ProjectVM
       ElseIf IniFile.m_ProjectMode = ProjectModeOpt.MACHINING And m_SceneSelType = SceneSelTypeOpt.MACHINING And
             (EgtGetType(nId) = GDB_TY.SRF_MESH Or EgtGetType(nId) = GDB_TY.SRF_FRGN) Then
          If Not EgtIsSelectedObj(nId) Then m_Controller.MouseSelectedObj(nId, bLast)
-      Else
+      ElseIf Not Keyboard.IsKeyDown(Key.LeftShift) Then
          m_Controller.MouseSelectedObj(nId, False)
-         If bLast Then
-            If EgtIsSelectedObj(nId) Then
-               ' Selezione layer in albero
-               Map.refManageLayerExpanderVM.UpdateObjInObjTreeNoMark(nId)
-               Map.refManageLayerExpanderVM.SelectIdInObjTreeNoMark(nId)
-               Map.refManageLayerExpanderVM.UpdateObjTree()
-            End If
-            EgtDraw()
+         If EgtIsSelectedObj(nId) Then
+            ' Selezione layer in albero
+            Map.refManageLayerExpanderVM.UpdateObjInObjTreeNoMark(nId)
+            Map.refManageLayerExpanderVM.SelectIdInObjTreeNoMark(nId)
+            Map.refManageLayerExpanderVM.UpdateObjTree()
          End If
+         EgtDraw()
+      Else
+         m_Controller.MouseSelectedObj(nId, bLast)
       End If
-      ' Carico se presenti le dimensioni della griglia
-      Application.Current.Dispatcher.BeginInvoke(
-         Sub()
-            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))
-         End Sub,
-      DispatcherPriority.Render)
-   End Sub
-
-   Private Sub OnMouseSelectedColor(ByVal sender As Object, ByVal nId As Integer) Handles m_ProjectScene.OnMouseSelectedColor
-      m_Controller.MouseSelectedColor(nId)
    End Sub
 
    Private Sub OnMouseSelectedPart(ByVal sender As Object, ByVal nId As Integer) Handles m_ProjectScene.OnMouseSelectedPart
@@ -1475,11 +1409,6 @@ Public Class ProjectVM
             Analyze.CreateAnalyzeGroup()
             Analyze.CreateFacetNormal(nId, nFac)
             Analyze.CreateFacetLoops(nId, nFac)
-
-            If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-               Analyze.CreateTriaLoop(nId, nSub)
-            End If
-
             ' Recupero i dati (in globale o griglia a seconda della impostazione)
             Dim ptC As Point3d
             Dim vtN As Vector3d
@@ -1491,10 +1420,6 @@ Public Class ProjectVM
                                  " : C(" + LenToString(ptC.x, 3) + "," + LenToString(ptC.y, 3) + "," + LenToString(ptC.z, 3) + ")" +
                                    " N(" + DoubleToString(vtN.x, 4) + "," + DoubleToString(vtN.y, 4) + "," + DoubleToString(vtN.z, 4) + ")" +
                                  " / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2)
-
-            If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-               sOut &= ", Triangle " + nSub.ToString()
-            End If
             Map.refStatusBarVM.NotifyStatusOutput(sOut)
          End If
          ' Se Regione, visualizzo dati parte toccata
@@ -1518,20 +1443,6 @@ Public Class ProjectVM
                                  " / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2)
             Map.refStatusBarVM.NotifyStatusOutput(sOut)
          End If
-      ElseIf EgtGetType(nId) = GDB_TY.SRF_BEZ Then
-         ' Visualizzo il punto selezionato, la normale e le tangenti nelle direzioni dei parametri
-         Analyze.CreateAnalyzeGroup()
-         Dim dU As Double
-         Dim dV As Double
-         If Analyze.CreateSBzPointNormalAndTangents(nId, ptSel, dU, dV) Then
-            Dim sOut As String = "U = " + dU.ToString("F3") +
-                                  "; V = " + dV.ToString("F3")
-            Map.refStatusBarVM.NotifyStatusOutput(sOut)
-            If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-               Analyze.CreateSBzIsoParam(nId, dU, dV)
-            End If
-         End If
-
       End If
       ' Aggiorno la visualizzazione
       EgtDraw()
@@ -1653,7 +1564,7 @@ Public Class ProjectVM
             nFlag = GetPrivateProfileInt(S_IMPORT, K_CNCFLAG, EIC_FL.NONE)
          ElseIf nType = FT.BTL Or nType = FT.BTLX Then
             nFlag = GetPrivateProfileInt(S_IMPORT, K_BTLFLAG, EIB_FL.NONE)
-         ElseIf nType = FT._3MF Then
+         ElseIf nType = FT._3MF
             nFlag = GetPrivateProfileInt(S_IMPORT, K_3MFFLAG, EI3_FL.NONE)
          ElseIf nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
                 nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then

RightTray/RightTrayV.xaml

@@ -2,7 +2,6 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:local="clr-namespace:EgtCAM5"
-      DockPanel.Dock="Right"
-      Margin="1,0,0,0">
+      DockPanel.Dock="Right">
    <local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
 </Grid>

SetUpDb/SetUpDbV.xaml.vb

@@ -11,7 +11,7 @@
       m_SetUpDbVM = SetUpDbVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.OnCloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.m_CloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

SetUpDb/SetUpDbVM.vb

@@ -10,7 +10,7 @@ Public Class SetUpDbVM
 
    Private Const SETUP_FILEEXTENSION As String = ".stu"
 
-   Friend Event OnCloseWindow(bDialogResult As Boolean)
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
 
    Private m_SetUpList As New ObservableCollection(Of String)
    Public ReadOnly Property SetUpList As ObservableCollection(Of String)
@@ -263,7 +263,7 @@ Public Class SetUpDbVM
                Return
          End Select
       End If
-      RaiseEvent OnCloseWindow(True)
+      RaiseEvent m_CloseWindow(True)
    End Sub
 
 #End Region    ' Close

Special-BeamWall/BeamPanelV.xaml

@@ -1,7 +1,6 @@
 <EgtFloating:EgtFloatingPanel x:Class="BeamPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                              xmlns:local="clr-namespace:EgtCAM5"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               Visibility="{Binding BeamPanel_Visibility}">
 
@@ -11,18 +10,13 @@
             <StackPanel Orientation="Horizontal"/>
          </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
-      <ItemsControl.Resources>
-         <DataTemplate DataType="{x:Type local:ButtonItem}">
+      <ItemsControl.ItemTemplate>
+         <DataTemplate>
             <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
                <Image Source="{Binding ImagePath}"/>
             </Button>
          </DataTemplate>
-         <DataTemplate DataType="{x:Type local:SeparatorItem}">
-            <Border Style="{StaticResource Trimming_Border}">
-               <Border Style="{StaticResource Separator_Border}"/>
-            </Border>
-         </DataTemplate>
-      </ItemsControl.Resources>
+      </ItemsControl.ItemTemplate>
    </ItemsControl>
    
 </EgtFloating:EgtFloatingPanel>

Special-BeamWall/BeamPanelVM.vb

@@ -1,11 +1,14 @@
-Public Class BeamPanelVM
+Imports System.IO
+Imports EgtUILib
+
+Public Class BeamPanelVM
    Inherits VMBase
 
    Friend Const BEAM_PROCESS As String = "Beam\Process.lua"
    Friend Const BEAM_MACHININGS As String = "BeamMachinings"
 
-   Private m_ButtonList As New List(Of ButtonListItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
+   Private m_ButtonList As New List(Of ButtonItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonItem)
       Get
          Return m_ButtonList
       End Get
@@ -29,7 +32,7 @@
       If IniFile.IsActiveBeam() Then
          ' Inizializzo i bottoni leggendoli da file ini
          Dim BtnIndex As Integer = 1
-         Dim CurrBtn As ButtonListItem = Nothing
+         Dim CurrBtn As ButtonItem = Nothing
          While GetPrivateProfileButton(S_BEAM, K_BEAMBUTTON & BtnIndex, IniFile.m_sBeamDirPath, CurrBtn)
             m_ButtonList.Add(CurrBtn)
             BtnIndex += 1

Special-BeamWall/BeamWallPanelV.xaml

@@ -1,7 +1,6 @@
 <EgtFloating:EgtFloatingPanel x:Class="BeamWallPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                              xmlns:local="clr-namespace:EgtCAM5"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               Visibility="{Binding BeamWallPanel_Visibility}">
 
@@ -11,18 +10,13 @@
             <StackPanel Orientation="Horizontal"/>
          </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
-      <ItemsControl.Resources>
-         <DataTemplate DataType="{x:Type local:ButtonItem}">
+      <ItemsControl.ItemTemplate>
+         <DataTemplate>
             <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
                <Image Source="{Binding ImagePath}"/>
             </Button>
          </DataTemplate>
-         <DataTemplate DataType="{x:Type local:SeparatorItem}">
-            <Border Style="{StaticResource Trimming_Border}">
-               <Border Style="{StaticResource Separator_Border}"/>
-            </Border>
-         </DataTemplate>
-      </ItemsControl.Resources>
+      </ItemsControl.ItemTemplate>
    </ItemsControl>
    
 </EgtFloating:EgtFloatingPanel>

Special-BeamWall/BeamWallPanelVM.vb

@@ -1,8 +1,11 @@
-Public Class BeamWallPanelVM
+Imports System.IO
+Imports EgtUILib
+
+Public Class BeamWallPanelVM
    Inherits VMBase
 
-   Private m_ButtonList As New List(Of ButtonListItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
+   Private m_ButtonList As New List(Of ButtonItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonItem)
       Get
          Return m_ButtonList
       End Get
@@ -27,7 +30,7 @@
          GetPrivateProfileString(S_BEAMWALL, K_BEAMWALLBASEDIR, "", m_sBeamWallDirPath)
          ' Inizializzo i bottoni leggendoli da file ini
          Dim BtnIndex As Integer = 1
-         Dim CurrBtn As ButtonListItem = Nothing
+         Dim CurrBtn As ButtonItem = Nothing
          While GetPrivateProfileButton(S_BEAMWALL, K_BEAMWALLBUTTON & BtnIndex, IniFile.m_sBeamWallDirPath, CurrBtn)
             m_ButtonList.Add(CurrBtn)
             BtnIndex += 1

Special-BeamWall/WallPanelV.xaml

@@ -1,7 +1,6 @@
 <EgtFloating:EgtFloatingPanel x:Class="WallPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                              xmlns:local="clr-namespace:EgtCAM5"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               Visibility="{Binding WallPanel_Visibility}">
 
@@ -11,18 +10,13 @@
             <StackPanel Orientation="Horizontal"/>
          </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
-      <ItemsControl.Resources>
-         <DataTemplate DataType="{x:Type local:ButtonItem}">
+      <ItemsControl.ItemTemplate>
+         <DataTemplate>
             <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
                <Image Source="{Binding ImagePath}"/>
             </Button>
          </DataTemplate>
-         <DataTemplate DataType="{x:Type local:SeparatorItem}">
-            <Border Style="{StaticResource Trimming_Border}">
-               <Border Style="{StaticResource Separator_Border}"/>
-            </Border>
-         </DataTemplate>
-      </ItemsControl.Resources>
+      </ItemsControl.ItemTemplate>
    </ItemsControl>
    
 </EgtFloating:EgtFloatingPanel>

Special-BeamWall/WallPanelVM.vb

@@ -1,10 +1,13 @@
-Public Class WallPanelVM
+Imports System.IO
+Imports EgtUILib
+
+Public Class WallPanelVM
    Inherits VMBase
 
    Friend Const WALL_MACHININGS As String = "WallMachinings"
 
-   Private m_ButtonList As New List(Of ButtonListItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
+   Private m_ButtonList As New List(Of ButtonItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonItem)
       Get
          Return m_ButtonList
       End Get
@@ -28,7 +31,7 @@
       If IniFile.IsActiveWall() Then
          ' Inizializzo i bottoni leggendoli da file ini
          Dim BtnIndex As Integer = 1
-         Dim CurrBtn As ButtonListItem = Nothing
+         Dim CurrBtn As ButtonItem = Nothing
          While GetPrivateProfileButton(S_WALL, K_WALLBUTTON & BtnIndex, IniFile.m_sWallDirPath, CurrBtn)
             m_ButtonList.Add(CurrBtn)
             BtnIndex += 1

Special-Doors/MTableDbV.xaml.vb

@@ -175,7 +175,7 @@ Public Class MTableDbV
    Public Sub DataGrid_PreviewMouseMove(sender As Object, e As MouseEventArgs)
       Dim Element As Object = e.OriginalSource
       While Not IsNothing(Element) AndAlso Not TypeOf Element Is ScrollBar
-         Element = VisualTreeHelper.GetParent(CType(Element, DependencyObject))
+         Element = VisualTreeHelper.GetParent(Element)
       End While
       ' verifico che non sia ScrollBar, di modo che questa continui a funzionare, ma non possa selezionare piu' righe trascinando
       If IsNothing(Element) OrElse Not TypeOf Element Is ScrollBar Then

Special-ReversePost/ReversePostPanelV.xaml

@@ -1,28 +0,0 @@
-<EgtFloating:EgtFloatingPanel x:Class="ReversePostPanelV"
-                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                              xmlns:local="clr-namespace:EgtCAM5"
-                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-                              Visibility="{Binding ReversePostPanel_Visibility}">
-
-   <ItemsControl ItemsSource="{Binding ButtonList}">
-      <ItemsControl.ItemsPanel>
-         <ItemsPanelTemplate>
-            <StackPanel Orientation="Horizontal"/>
-         </ItemsPanelTemplate>
-      </ItemsControl.ItemsPanel>
-      <ItemsControl.Resources>
-         <DataTemplate DataType="{x:Type local:ButtonItem}">
-            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
-               <Image Source="{Binding ImagePath}"/>
-            </Button>
-         </DataTemplate>
-         <DataTemplate DataType="{x:Type local:SeparatorItem}">
-            <Border Style="{StaticResource Trimming_Border}">
-               <Border Style="{StaticResource Separator_Border}"/>
-            </Border>
-         </DataTemplate>
-      </ItemsControl.Resources>
-   </ItemsControl>
-   
-</EgtFloating:EgtFloatingPanel>

Special-ReversePost/ReversePostPanelV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class ReversePostPanelV
-
-End Class