-aggiunto campo combobox in note lavorazione

- aggiunto comando per creare curve di Bezier polinomiali di grado 3 con modalità simili ai BiArchi.

Constants/ConstIni.vb

@@ -189,6 +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_SELVMILLQUALITY As String = "VMillQuality"
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
    Public Const K_SHOWONLYTABLE As String = "ShowOnlyTable"
@@ -198,6 +199,7 @@ Module ConstIni
    Public Const S_SIMUL As String = "Simul"
    Public Const K_SLIDERX As String = "SliderX"
    Public Const K_SLIDERVAL As String = "SliderVal"
+   Public Const K_TRACEENABLE As String = "TraceEnable"
 
    Public Const S_OPTIONS As String = "Options"
    Public Const K_NEWMACHININGISLASTONE As String = "NewMachiningIsLastOne"

Constants/ConstMachIni.vb

@@ -1,6 +1,10 @@
 Module ConstMachIni
 
+   Public Const S_PARTPROGRAM As String = "PartProgram"
+   Public Const K_EXTENSION As String = "Extension"
+
    Public Const S_TOOLS As String = "Tools"
+   Public Const K_PROBE As String = "Probe"
    Public Const K_DRILLBIT As String = "Drillbit"
    Public Const K_SAWBLADE As String = "Sawblade"
    Public Const K_MILL As String = "Mill"
@@ -8,22 +12,17 @@
    Public Const K_CHISEL As String = "Chisel"
    Public Const K_WATERJET As String = "WaterJet"
    Public Const K_COMPO As String = "Compo"
-   Public Const K_SHOWTOOLCHANGER As String = "ShowToolChanger"
-   Public Const K_SHOWHEADEXIT As String = "ShowHeadExit"
-   Public Const K_DRILLHOLDER As String = "DrillHolder"
-   Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
-   Public Const K_MILLHOLDER As String = "MillHolder"
    Public Const K_DRILLMAKER As String = "DrillMaker"
    Public Const K_SAWBLADEMAKER As String = "SawbladeMaker"
    Public Const K_MILLMAKER As String = "MillMaker"
    Public Const K_MORTISEMAKER As String = "MortiseMaker"
    Public Const K_CHISELMAKER As String = "ChiselMaker"
-   Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
    Public Const K_ACTIVE As String = "Active"
 
    Public Const S_TOOLHOLDER As String = "ToolHolder"
 
    Public Const S_MACHININGS As String = "Machinings"
+   Public Const K_PROBING As String = "Probing"
    Public Const K_SAWING As String = "Sawing"
    Public Const K_DRILLING As String = "Drilling"
    Public Const K_MILLING As String = "Milling"
@@ -37,18 +36,12 @@
    Public Const K_SURFFINISHING As String = "SurfFinishing"
    Public Const K_5AXMILLING As String = "5AxMilling"
    Public Const K_WATERJETTING As String = "WaterJetting"
-   Public Const K_SAWINGONARCS As String = "SawingOnArcs"
 
    Public Const S_GENMACHINING As String = "GenMachining"
    Public Const K_GENSCRIPT As String = "GenScript"
 
-   Public Const S_TOOLCHANGER As String = "ToolChanger"
-   Public Const K_NUMBER As String = "Number"
-   Public Const K_POS As String = "Pos"
-   Public Const K_NAME As String = "Name"
-   Public Const K_MANUALNUMBER As String = "ManualNumber"
-   Public Const K_MANUALPOS As String = "ManualPos"
-   Public Const K_MANUALNAME As String = "ManualName"
+   Public Const S_5AXMILLING As String = "5AxMilling"
+   Public Const K_5AXSCRIPT As String = "5AxScript"
 
    Public Const S_DISPOSITION As String = "Disposition"
    Public Const K_DISP_INITSCRIPT As String = "InitScript"
@@ -68,6 +61,9 @@
    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"
 

DrawPanel/DrawPanelV.xaml

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

DrawPanel/DrawPanelVM.vb

@@ -50,7 +50,7 @@ Public Class DrawPanelVM
          Return EgtMsg(MSG_DRAWPANEL + 3)
       End Get
    End Property
-   Public ReadOnly Property CirclePDToolTip As String
+   Public ReadOnly Property CircleCPToolTip As String
       Get
          Return EgtMsg(MSG_DRAWPANEL + 4)
       End Get
@@ -72,14 +72,25 @@ Public Class DrawPanelVM
    End Property
    Public ReadOnly Property Arc3PToolTip As String
       Get
-         Return EgtMsg(MSG_DRAWPANEL + 7)
+         Return EgtMsg(5207)
+      End Get
+   End Property
+   Public ReadOnly Property Arc2PRToolTip As String
+      Get
+         Return EgtMsg(5169)
       End Get
    End Property
    Public ReadOnly Property ArcPDPToolTip As String
       Get
          Return EgtMsg(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)
@@ -470,7 +481,9 @@ Public Class DrawPanelVM
    Private m_cmdCircle3P As ICommand
    Private m_cmdArcCSE As ICommand
    Private m_cmdArc3P As ICommand
+   Private m_cmdArc2PR As ICommand
    Private m_cmdArcPDP As ICommand
+   Private m_cmdBiArc As ICommand
    Private m_cmdRectangle2P As ICommand
    Private m_cmdPolygon As ICommand
    Private m_cmdPolygonSide As ICommand
@@ -748,6 +761,29 @@ Public Class DrawPanelVM
 
 #End Region ' Arc3PCommand
 
+#Region "Arc2PRCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Arc2PR.
+   ''' </summary>
+   Public ReadOnly Property Arc2PRCommand As ICommand
+      Get
+         If m_cmdArc2PR Is Nothing Then
+            m_cmdArc2PR = New RelayCommand(AddressOf Arc2PR)
+         End If
+         Return m_cmdArc2PR
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Arc2PR.  This method is invoked by the Arc2PRCommand.
+   ''' </summary>
+   Public Sub Arc2PR(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC2PR)
+   End Sub
+
+#End Region ' Arc2PRCommand
+
 #Region "ArcPDPCommand"
 
    ''' <summary>
@@ -778,6 +814,33 @@ Public Class DrawPanelVM
 
 #End Region ' ArcPDPCommand
 
+#Region "BiArcCommand"
+
+   ''' <summary>
+   ''' Returns a command that do BiArc.
+   ''' </summary>
+   Public ReadOnly Property BiArcCommand As ICommand
+      Get
+         If m_cmdBiArc Is Nothing Then
+            m_cmdBiArc = New RelayCommand(AddressOf BiArc)
+         End If
+         Return m_cmdBiArc
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the BiArc.  This method is invoked by the BiArcCommand.
+   ''' </summary>
+   Public Sub BiArc(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.BIARC)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CURVEBEZIER)
+      End If
+   End Sub
+
+#End Region ' BiArcCommand
+
 #Region "Rectangle2PCommand"
 
    ''' <summary>

EgtCAM5.vbproj

@@ -173,6 +173,9 @@
       <DependentUpon>EstimationsExpanderV.xaml</DependentUpon>
     </Compile>
     <Compile Include="OptionPanel\MachiningOptionPanel\EstimationsExpander\EstimationsExpander.vb" />
+    <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\ProbingParameterExpanderV.xaml.vb">
+      <DependentUpon>ProbingParameterExpanderV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\FiveAxisMachinigParameterExpanderV.xaml.vb">
       <DependentUpon>FiveAxisMachinigParameterExpanderV.xaml</DependentUpon>
     </Compile>
@@ -475,6 +478,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\ProbingParameterExpanderV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\FiveAxisMachinigParameterExpanderV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1038,6 +1045,12 @@
   <ItemGroup>
     <Resource Include="Resources\DrawPanel\StmMoveVertex.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\Arc2PR.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\BiArc.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe

MainWindow/MainWindowVM.vb

@@ -385,8 +385,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2703, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2703, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2707, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2707, 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

My Project/AssemblyInfo.vb

@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.3.2")>
-<Assembly: AssemblyFileVersion("2.7.3.2")>
+<Assembly: AssemblyVersion("2.7.7.2")>
+<Assembly: AssemblyFileVersion("2.7.7.2")>
 

OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb

@@ -152,6 +152,8 @@ 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,4 +1,6 @@
-Imports EgtUILib
+Imports System.ComponentModel
+Imports System.Globalization
+Imports EgtUILib
 
 Public Class DispositionParameterExpanderVM
    Inherits ViewModelBase
@@ -329,14 +331,15 @@ Public Class DispositionParameterExpanderVM
                ' imposto il riferimento della tavola
                Dim ptTableRef As Point3d
                EgtGetTableRef(1, ptTableRef)
-               ' calcolo il punto del grezzo da posizionar nelle coordinate di input
+               ' calcolo il punto del grezzo da posizionare nelle coordinate di input
                Dim ptRawRefPoint As Point3d = DispositionUtility.GetRawPartRefPoint(nFirstSelectedId, m_RawRefPosition)
                ' creo un punto con le coordinate di input espresse rispetto alla tavola
                Dim TableRefInputPoint As New Point3d(InputPoint)
                TableRefInputPoint.LocToLoc(EgtGetGridFrame(), New Frame3d(ptTableRef))
                ' calcolo il vettore di spostamento del grezzo
                vtMove = TableRefInputPoint - ptRawRefPoint
-            ' se è una ventosa
+vtMove.z = 0
+' se è una ventosa
             ElseIf EgtVerifyFixture(nFirstSelectedId) Then
                Dim SelObjFrame3d As New Frame3d(Frame3d.GLOB)
                EgtGetGroupGlobFrame(nFirstSelectedId, SelObjFrame3d)
@@ -361,7 +364,7 @@ Public Class DispositionParameterExpanderVM
                   DispositionUtility.MoveRawPartPartAndFixture(GDB_ID.SEL, New Vector3d(0, vtRemainingMove.y, 0), DispositionUtility.SelType.NULL)
                End If
             End If
-         ' se rotazione
+' se rotazione
          Else
             Dim nSelId As Integer = EgtGetFirstSelectedObj()
             If nSelId = GDB_ID.NULL Then Return
@@ -371,7 +374,7 @@ Public Class DispositionParameterExpanderVM
             If EgtVerifyRawPartCurrPhase(nSelId) Then
                ' Se primo carattere è nome asse
                If sVal(0) = "X"c Then
-                  sVal = sVal.Remove( 0, 1) 
+sVal = sVal.Remove( 0, 1) 
                   vtRotAx = Vector3d.X_AX()
                ElseIf sVal(0) = "Y"c Then
                   sVal = sVal.Remove( 0, 1)
@@ -434,8 +437,16 @@ 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)
+         m_InputValue = ptR.x.ToString("F1", CultureInfo.InvariantCulture) & "," & ptR.y.ToString("F1", CultureInfo.InvariantCulture)
+         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 dRawPartMin As Point3d = bboxRawPart.Min
-                     dRawPartMin.ToLoc(TableFrame)
+                     Dim ptRawPartMin As Point3d = bboxRawPart.Min
+                     ptRawPartMin.ToLoc(TableFrame)
                      ' se l'altezza grezzo è minore di quella della ventosa, lo sposto alla stessa altezza
-                     If dRawPartMin.z < dFixtureHeight - EPS_SMALL Then
-                        Dim vtMove As New Vector3d(0, 0, dFixtureHeight - dRawPartMin.z)
+                     If ptRawPartMin.z < dFixtureHeight - EPS_SMALL Then
+                        Dim vtMove As New Vector3d(0, 0, dFixtureHeight - ptRawPartMin.z)
                         EgtMoveRawPart(nRawPartId, vtMove)
                         ' ricalcolo il BBox del solido del grezzo per averlo aggiornato con la nuova Z
                         EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPart)
@@ -358,19 +358,19 @@ Public NotInheritable Class DispositionUtility
                         nOtherFixtureId = EgtGetNextFixture(nOtherFixtureId)
                      End While
                      ' recupero altezza grezzo riferita alla tavola
-                     Dim dRawPartMin As Point3d = bboxRawPart.Min
-                     dRawPartMin.ToLoc(TableFrame)
+                     Dim ptRawPartMin As Point3d = bboxRawPart.Min
+                     ptRawPartMin.ToLoc(TableFrame)
                      ' se non ci sono ventose sotto il grezzo
                      If Not bIsFixtureUnderRawPart Then
                         ' verifico che il grezzo sia ad altezza tavola
-                        If dRawPartMin.z <> 0 Then
-                           Dim vtMove As New Vector3d(0, 0, -dRawPartMin.z)
+                        If ptRawPartMin.z <> 0 Then
+                           Dim vtMove As New Vector3d(0, 0, -ptRawPartMin.z)
                            EgtMoveRawPart(nRawPartId, vtMove)
                         End If
                      Else
                         ' se ci sono verifico che l'altezza del grezzo sia quella della ventosa più alta
-                        If Math.Abs(dRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
-                           Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - dRawPartMin.z)
+                        If Math.Abs(ptRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
+                           Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - ptRawPartMin.z)
                            EgtMoveRawPart(nRawPartId, vtMove)
                         End If
                      End If
@@ -472,23 +472,30 @@ Public NotInheritable Class DispositionUtility
       ' Recupero il solido del grezzo
       Dim nMovedRawSolidId As Integer = EgtGetFirstNameInGroup(nRawId, RAWSOLID)
       ' definisco il box del solido del grezzo
-      Dim bboxRawPartId As New BBox3d
-      EgtGetBBoxGlob(nMovedRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPartId)
+      Dim bboxRawPart As New BBox3d
+      EgtGetBBoxGlob(nMovedRawSolidId, GDB_BB.STANDARD, bboxRawPart)
+      ' aggiungo il box dell'eventuale supporto o sottopezzo
+      Dim nSupportId As Integer = EgtGetFirstNameInGroup(nRawId, SUPPORT)
+      If nSupportId <> GDB_ID.NULL Then
+         Dim bboxSupport As New BBox3d
+         EgtGetBBoxGlob(nSupportId, GDB_BB.STANDARD, bboxSupport)
+         bboxRawPart.Add( bboxSupport)
+      End If
       ' Variabile che dice se c'è almeno una ventosa sotto il grezzo
       Dim bIsFixtureUnderRawPart As Boolean = False
       Dim bboxFixture As New BBox3d
       ' variabile che contiene la massima altezza delle ventose sottostanti
       Dim dMaxFixtureHeight As Double = 0
       ' recupero altezza grezzo riferita alla tavola
-      Dim dRawPartMin As Point3d = bboxRawPartId.Min
-      dRawPartMin.ToLoc(TableFrame)
+      Dim ptRawPartMin As Point3d = bboxRawPart.Min
+      ptRawPartMin.ToLoc(TableFrame)
       ' Ciclo sui sottopezzi presenti per verificare le collisioni con il grezzo
       Dim nFixtureId As Integer = EgtGetFirstFixture()
       While nFixtureId <> GDB_ID.NULL
          ' calcolo il BBox del sottopezzo
          EgtGetBBoxGlob(nFixtureId, GDB_BB.ONLY_VISIBLE, bboxFixture)
          ' verifico se c'è sovrapposizione
-         If bboxRawPartId.OverlapsXY(bboxFixture) Then 
+         If bboxRawPart.OverlapsXY(bboxFixture) Then 
             ' recupero il tipo di fixture         
             Dim nFxtType As FIX_TYPE = FixtureType(nFixtureId)
             ' Se è ventosa o morsa
@@ -501,22 +508,22 @@ Public NotInheritable Class DispositionUtility
                   dMaxFixtureHeight = dFixtureHeight
                End If
                ' se l'altezza grezzo è diversa da quella della ventosa, lo sposto alla stessa altezza
-               If dRawPartMin.z < dFixtureHeight - EPS_SMALL Then
-                  Dim vtMove As New Vector3d(0, 0, dFixtureHeight - dRawPartMin.z)
+               If ptRawPartMin.z < dFixtureHeight - EPS_SMALL Then
+                  Dim vtMove As New Vector3d(0, 0, dFixtureHeight - ptRawPartMin.z)
                   EgtMoveRawPart(nRawId, vtMove)
                   ' recupero il solido del grezzo
                   Dim nRawSolidId As Integer = EgtGetFirstNameInGroup(nRawId, RAWSOLID)
                   ' ricalcolo il BBox del solido del grezzo per averlo aggiornato con la nuova Z
-                  EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPartId)
-                  dRawPartMin = bboxRawPartId.Min
-                  dRawPartMin.ToLoc(TableFrame)
+                  EgtGetBBoxGlob(nRawSolidId, GDB_BB.ONLY_VISIBLE, bboxRawPart)
+                  ptRawPartMin = bboxRawPart.Min
+                  ptRawPartMin.ToLoc(TableFrame)
                End If
                bIsFixtureUnderRawPart = True
             End If
             ' Se è morsa
             If nFxtType = FIX_TYPE.VISE Then
                ' regolo la posizione in Z della morsa
-               EgtSetFixtureMobile( nFixtureId, bboxRawPartId.DimZ())
+               EgtSetFixtureMobile( nFixtureId, bboxRawPart.DimZ())
             End If
             ' Se è un riferimento o una morsa
             If nFxtType = FIX_TYPE.REFERENCE Or nFxtType = FIX_TYPE.VISE Then
@@ -525,7 +532,7 @@ Public NotInheritable Class DispositionUtility
                ' calcolo bbox dell'arco di riferimento
                Dim bboxArcRef As New BBox3d
                EgtGetBBoxGlob(arcRefId, GDB_BB.STANDARD, bboxArcRef)
-               If bboxRawPartId.OverlapsXY(bboxArcRef) Then
+               If bboxRawPart.OverlapsXY(bboxArcRef) Then
                   ' recupero contorno del grezzo
                   Dim ccompoRawPartOutlineId As Integer = EgtGetFirstNameInGroup(nRawId, RAWOUTLINE)
                   'recupero il raggio dell'arco di riferimento
@@ -587,14 +594,14 @@ Public NotInheritable Class DispositionUtility
       ' se non ci sono ventose sotto il grezzo
       If Not bIsFixtureUnderRawPart Then
          ' verifico che il grezzo sia ad altezza tavola
-         If dRawPartMin.z <> 0 Then
-            Dim vtMove As New Vector3d(0, 0, -dRawPartMin.z)
+         If ptRawPartMin.z <> 0 Then
+            Dim vtMove As New Vector3d(0, 0, -ptRawPartMin.z)
             EgtMoveRawPart(nRawId, vtMove)
          End If
       Else
          ' se ci sono verifico che l'altezza del grezzo sia quella della ventosa più alta
-         If Math.Abs(dRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
-            Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - dRawPartMin.z)
+         If Math.Abs(ptRawPartMin.z - dMaxFixtureHeight) > EPS_SMALL Then
+            Dim vtMove As New Vector3d(0, 0, dMaxFixtureHeight - ptRawPartMin.z)
             EgtMoveRawPart(nRawId, vtMove)
          End If
       End If

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml

@@ -238,6 +238,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml

@@ -226,6 +226,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/FiveAxisMachinigParameterExpanderV.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="FiveAxisMachinigParameterExpanderV"
+<UserControl x:Class="FiveAxisMachiningParameterExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
@@ -216,6 +216,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

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

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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml

@@ -216,6 +216,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb

@@ -152,8 +152,9 @@ Public Class MachiningParameterExpanderVM
    Dim StoneDrillParamExpanderV As StoneDrillingParameterExpanderV
    Dim SurfFinishParamExpanderV As SurfFinishingParameterExpanderV
    Dim WjParamExpanderV As WaterjettingParameterExpanderV
-   Dim FiveAxExpanderV As FiveAxisMachinigParameterExpanderV
+   Dim FiveAxExpanderV As FiveAxisMachiningParameterExpanderV
    Dim SurfRoughExpanderV As SurfRoughingParameterExpanderV
+   Dim ProbExpanderV As ProbingParameterExpanderV
 
    Private Sub Dummy()
 
@@ -270,13 +271,17 @@ Public Class MachiningParameterExpanderVM
                WjParamExpanderV.DataContext = m_CurrOperation
                Return WjParamExpanderV
             Case MCH_OY.FIVEAXISMILLING
-               If IsNothing(FiveAxExpanderV) Then FiveAxExpanderV = New FiveAxisMachinigParameterExpanderV
+               If IsNothing(FiveAxExpanderV) Then FiveAxExpanderV = New FiveAxisMachiningParameterExpanderV
                FiveAxExpanderV.DataContext = m_CurrOperation
                Return FiveAxExpanderV
             Case MCH_OY.SURFROUGHING
                If IsNothing(SurfRoughExpanderV) Then SurfRoughExpanderV = New SurfRoughingParameterExpanderV
                SurfRoughExpanderV.DataContext = m_CurrOperation
                Return SurfRoughExpanderV
+            Case MCH_OY.PROBING
+               If IsNothing(ProbExpanderV) Then ProbExpanderV = New ProbingParameterExpanderV
+               ProbExpanderV.DataContext = m_CurrOperation
+               Return ProbExpanderV
          End Select
 
          'MachiningParameterExpanderItem.ReadOperationParam()
@@ -371,21 +376,12 @@ Public Class MachiningParameterExpanderVM
          Return
       End If
 
-      Dim bRecalc As Boolean = False
-      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-         bRecalc = True
-      Else
-         ' Controllo se il tipo e' dr o sr o lr bRecalc e' true come quando viene selezionato Shift
-         For Each ItemNote As NoteListBoxItem In m_CurrOperation.NotesList
-            bRecalc = ItemNote.Type.Equals("dr") OrElse ItemNote.Type.Equals("lr") OrElse ItemNote.Type.Equals("sr") OrElse ItemNote.Type.Equals("br")
-            If bRecalc Then Exit For
-         Next
-      End If
+      ' Verifico se forzato ricalcolo da interfaccia
+      Dim bRecalc As Boolean = ((Keyboard.Modifiers And ModifierKeys.Shift) <> 0)
 
-      ' La modifica di alcuni parametri forza il ricalcolo della geometria
-      Dim ModifiedGeometry As Boolean = m_CurrOperation.m_IsModifiedSelectedFaceUseType
-      ' aggiorno valori modificati
+      ' Aggiorno parametri di lavorazione
       m_CurrOperation.WriteOperationParam()
+
       ' Carico tutta la geometria selezionata in una lista
       Dim SelectedGeometry As New List(Of Integer)
       Dim EntityIndex As Integer = EgtGetFirstSelectedObj()
@@ -398,49 +394,19 @@ Public Class MachiningParameterExpanderVM
          (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, ...)
+         ' Imposto geometria
+         Dim vId() As Integer = Nothing
+         Dim vSub() As Integer = Nothing
+         SelData.GetAllIdSub(vId, vSub)
+         EgtSetMachiningGeometry(vId, vSub)
+      ' 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
+         ' Imposto geometria
+         EgtSetMachiningGeometry(SelectedGeometry.ToArray)
       End If
-      ' Ricalcolo la lavorazione
-      If Not EgtApplyMachining(bRecalc Or ModifiedGeometry) Then
+
+      ' Rigenero la lavorazione
+      If Not EgtApplyMachining(bRecalc) Then
          If EgtGetLastMachMgrErrorId() <> 0 Then
             Dim sErr As String = EgtGetLastMachMgrErrorString()
             Dim sInfo As String = String.Empty
@@ -459,6 +425,7 @@ Public Class MachiningParameterExpanderVM
             Map.refStatusBarVM.NotifyStatusOutput("")
          End If
       End If
+
       ' Restart visualizzazione utensile
       SetSliderScale( EgtGetPreviewMachiningToolStepCount())
       SetViewTool(True)

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml

@@ -234,6 +234,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml

@@ -243,6 +243,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ProbingParameterExpanderV.xaml

@@ -0,0 +1,275 @@
+<UserControl x:Class="ProbingParameterExpanderV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+   
+   <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+   </UserControl.Resources>
+
+   <StackPanel Name="OperationParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
+         <UniformGrid Columns="2">
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+                                                  Converter={StaticResource DepthUnitConverter}}"
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+         </UniformGrid>
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
+         <UniformGrid Columns="2">
+            <TextBlock Text="{Binding UserNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+               <EgtWPFLib5:EgtTextBox.ToolTip>
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
+            </EgtWPFLib5:EgtTextBox>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+                       Visibility="{Binding SysNotes_Visibility}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   Visibility="{Binding SysNotes_Visibility}"
+                                   IsReadOnly="True"/>
+         </UniformGrid>
+      </StackPanel>
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBx="{Binding Path=StartPos,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=SubTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
+            </StackPanel>
+         </Expander>
+
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
+                             Margin="2.5"/>
+                  <Button Command="{Binding ShowNoteListComboCommand}"
+                          ToolTip="{Binding ShowNoteToolTip}"
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
+                          Grid.Column="1"
+                          HorizontalAlignment="Right"
+                          Margin="2.5,2.5,7,2.5"
+                          Width="20">
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
+                  </Button>
+               </UniformGrid>
+            </Expander.Header>
+            <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="Auto"/>
+               </Grid.RowDefinitions>
+               <StackPanel>
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
+                                          ParamChBx="{Binding Path=InvertToolDir,
+                                                              UpdateSourceTrigger=PropertyChanged,
+                                                              ValidatesOnDataErrors=True}" 
+                                          Style="{DynamicResource CheckParamV_Margin}"/>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
+                                           ParamTxBx="{Binding Path=InitAngs,
+                                                               UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}" 
+                                           Style="{DynamicResource StringParamV_Margin}"/>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
+                                           ParamTxBx="{Binding Path=BlockedAxis,
+                                                               UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}" 
+                                           Style="{DynamicResource StringParamV_Margin}"/>
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True,
+                                                                  Mode=OneWay}"
+                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                                          Style="{DynamicResource ComboParamV_Margin}"/>
+               </StackPanel>
+               <Grid Grid.Row="1" Margin="0,5,0,0">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="Auto"/>
+                  </Grid.RowDefinitions>
+                  <ItemsControl ItemsSource="{Binding NotesList}">
+                     <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <TextBlock Text="{Binding Description}"
+                                         Margin="0,5.5,29,0"
+                                         Width="82"
+                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+                              <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                          Grid.Column="1"
+                                          Background="Transparent"
+                                          BorderBrush="Transparent">
+                                 <TabControl.ItemContainerStyle>
+                                    <Style TargetType="{x:Type TabItem}">
+                                       <Setter Property="Visibility" Value="Collapsed"/>
+                                    </Style>
+                                 </TabControl.ItemContainerStyle>
+                                 <TabItem Header="TEXT">
+                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
+                                             IsReadOnly="False"/>
+                                 </TabItem>
+                                 <TabItem Header="CHECKBOX">
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
+                                 </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
+                              </TabControl>
+                              <Button Command="{Binding RemoveItemNoteCommand}"
+                                      Grid.Column="2"
+                                      Width="20"
+                                      Height="20"
+                                      Margin="5,0,0,0">
+                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
+                              </Button>
+                           </Grid>
+                        </DataTemplate>
+                     </ItemsControl.ItemTemplate>
+                  </ItemsControl>
+                  <ComboBox ItemsSource="{Binding NotesListCombo}"
+                            SelectedItem="{Binding SelNoteItemCombo}"
+                            Grid.Row="1"
+                            Grid.ColumnSpan="1"
+                            Visibility="{Binding ComboAddVisibility}">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+               </Grid>
+            </Grid>
+         </Expander>
+
+         <Expander Style="{StaticResource ExpanderStyle}">
+            <Expander.Header>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
+            </Expander.Header>
+            <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Feed,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
+                                        ParamTxBx="{Binding Path=TipFeed,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
+                                        ParamTxBx="{Binding Path=EndFeed,
+                                                            UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
+         </Expander>
+         <Interactivity:Interaction.Behaviors>
+            <EgtCAM5:AutomaticCloseExpander/>
+         </Interactivity:Interaction.Behaviors>
+      </StackPanel>
+   </StackPanel>
+
+</UserControl>

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

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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml

@@ -215,6 +215,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml

@@ -219,6 +219,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml

@@ -213,6 +213,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml

@@ -211,6 +211,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml

@@ -219,6 +219,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml

@@ -226,6 +226,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml

@@ -236,6 +236,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WaterjettingParameterExpanderV.xaml

@@ -201,6 +201,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodDrillingParameterExpanderV.xaml

@@ -220,6 +220,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodMillingParameterExpanderV.xaml

@@ -238,6 +238,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodSawingParameterExpanderV.xaml

@@ -228,6 +228,11 @@
                                  <TabItem Header="CHECKBOX">
                                     <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
+                                 <TabItem Header="COMBOBOX">
+                                    <ComboBox ItemsSource="{Binding ListKeyValue}"
+                                              SelectedItem="{Binding SelKeyValue, UpdateSourceTrigger=PropertyChanged}"                                              
+                                              DisplayMemberPath="KeyValue"/>
+                                 </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
                                       Grid.Column="2"

OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb

@@ -177,6 +177,8 @@ 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.SetViewTool( True)

OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb

@@ -671,7 +671,8 @@ Public Class OperationsListExpanderVM
          If Not String.IsNullOrEmpty(sErr) Then
             MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Else
-            MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+            ' Errore nell'aggiornamento delle lavorazioni!
+            MessageBox.Show(EgtMsg(5346), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
          End If
       Else
          Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(MSG_OPERATION + 11))

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderV.xaml

@@ -51,7 +51,14 @@
                     <TextBlock Text="{Binding VMillMsg}" Margin="5,0,0,0"/>
                 </StackPanel>
 
-                <Grid>
+               <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.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="1*"/>

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb

@@ -248,7 +248,8 @@ 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
@@ -261,6 +262,16 @@ 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
@@ -365,7 +376,7 @@ Public Class SimulationExpanderVM
             End If
          Else
             ' Per evitare di ciclare rapidissimamente e consumare inutilmente CPU
-            System.Threading.Thread.Sleep(4)
+            System.Threading.Thread.Sleep(5)
          End If
          ' Costringo ad aggiornare UI
          UpdateUI()
@@ -397,6 +408,7 @@ 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
 
@@ -439,14 +451,15 @@ Public Class SimulationExpanderVM
          sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & sCncFile
       Else
          sCncFile = Path.ChangeExtension(sCurrFilePath, Nothing)
+         Dim sExt As String =  ".cnc"
+         EgtUILib.GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, sExt, sExt, IniFile.m_sCurrMachIniFilePath)
          If IniFile.m_bMachiningGroup Then
             Dim sMGrpName As String = String.Empty
             If EgtGetMachGroupName(EgtGetCurrMachGroup(), sMGrpName) Then
-               sCncFile &= "_" & sMGrpName & ".cnc"
+               sCncFile &= "_" & sMGrpName
                sInfo &= "-" & sMGrpName
             End If
-         Else
-            sCncFile &= ".cnc"
+            sCncFile = Path.ChangeExtension(sCncFile, sExt)
          End If
       End If
       Return True

OptionsWindow/OptionModule.vb

@@ -59,6 +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
    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
@@ -154,6 +155,8 @@ 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

OptionsWindow/OptionWindowV.xaml

@@ -9,7 +9,7 @@
                             WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
                             MinWidth="400" MinHeight="382"
-                            Width="400" Height="575"
+                            Width="400" Height="600"
                             CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
@@ -249,6 +249,15 @@
                       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">
@@ -394,9 +403,9 @@
          <StackPanel>
             <Grid Margin="5,20,5,0">
                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="3*"/>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="3*"/>
                </Grid.ColumnDefinitions>
                <Grid.RowDefinitions>
                   <RowDefinition Height="1*"/>
@@ -427,6 +436,9 @@
                           Grid.Row="3" Grid.Column="0" Margin="0,5,0,5"/>
                <CheckBox IsChecked="{Binding DoorsOn}" IsEnabled="{Binding DoorsEnabled}"
                          Grid.Row="3" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
+               <Button Content="{Binding UpdateMsg}" IsEnabled="{Binding DoorsActive}"
+                       Command="{Binding UpdateDoors_Command}"
+                       Grid.Row="3" Grid.Column="2" Height="26"/>
                <TextBlock Text="{Binding GunstockMsg}" VerticalAlignment="Center"
                           Grid.Row="4" Grid.Column="0" Margin="0,5,0,5"/>
                <CheckBox IsChecked="{Binding GunstockOn}" IsEnabled="{Binding GunstockEnabled}"

OptionsWindow/OptionWindowVM.vb

@@ -214,6 +214,17 @@ Public Class OptionWindowVM
       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 SelectedVMillTypeType As VMillSelTypeOpt
       Get
          Return OptionModule.m_SelVMillQuality
@@ -787,6 +798,11 @@ 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
@@ -824,6 +840,7 @@ 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"
 
@@ -1085,7 +1102,7 @@ Public Class OptionWindowVM
    End Property
    Public ReadOnly Property DoorsMsg As String
       Get
-         Return "Doors"
+         Return "Doors (" & Path.GetFileName( IniFile.m_sDoorsDirPath) & ")"
       End Get
    End Property
    Public ReadOnly Property GunstockMsg As String
@@ -1128,6 +1145,12 @@ 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
@@ -1349,10 +1372,18 @@ 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")
-      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
-         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-      End If
-      My.Computer.FileSystem.CreateDirectory(sTempDir)
+      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
       ' Unzip nel direttorio temporaneo
       Using zip As New Ionic.Zip.ZipFile(sMachZip)
          zip.ExtractAll(sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
@@ -1753,6 +1784,116 @@ 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>

Project/ProjectVM.vb

@@ -433,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)
+         Return (nFlag <> 0 And nFlag <> 3 And nFlag <> 4 And nFlag <> 8)
       End If
       If sExt = ".ddf" And Environment.GetCommandLineArgs.Count() > 2 Then
          ' Flag
@@ -597,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 Then
+         If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Or nFlag = 8 Then
             Map.refMachinePanelVM.SaveCurrentMachine()
             Map.refMainWindowVM.CloseApplicationCmd()
             ' Altrimenti se errore

Utility/IniFile.vb

@@ -288,7 +288,11 @@ Public Module IniFile
 
    Friend Function IsActiveDoors() As Boolean
       Dim bIsActive As Boolean = (IniFile.m_nKeyOptions And KEY_OPT.DOORS) <> 0 And (GetPrivateProfileInt(S_DOORS, K_DDFENABLE, 0) <> 0)
-      If bIsActive Then GetPrivateProfileString(S_DOORS, K_BASEDIR, "", m_sDoorsDirPath)
+      If bIsActive Then
+          Dim sTemp As String = ""
+          GetPrivateProfileString(S_DOORS, K_BASEDIR, "", sTemp)
+          m_sDoorsDirPath = sTemp.TrimEnd( "\"c)
+      End If
       Return bIsActive
    End Function
 

Utility/MachineModel.vb

@@ -11,6 +11,9 @@ Public Module MachineModel
    ''' </summary>
    Friend Function ReadActiveMachiningsFamilies() As MachiningsType()
       Dim ActiveMachiningsFamiliesList As New List(Of MachiningsType)
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_PROBING, 0, m_sCurrMachIniFilePath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.PROBING, .TypeName = EgtMsg(31220)})
+      End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_DRILLING, 0, m_sCurrMachIniFilePath) <> 0 Then
          ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.DRILLING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 1)})
       End If
@@ -163,6 +166,9 @@ Public Module MachineModel
    ''' </summary>
    Friend Function ReadActiveToolsFamilies() As ToolsFamily()
       Dim ActiveToolsFamiliesList As New List(Of ToolsFamily)
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_PROBE, 0, m_sCurrMachIniFilePath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.PROBE, EgtMsg(31011)))      ' Tastatore
+      End If
       If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_DRILLBIT, 0, m_sCurrMachIniFilePath) <> 0 Then
          ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(MSG_TOOLSDBPAGE + 1)))
       End If

Utility/SelData.vb

@@ -21,6 +21,7 @@ Module SelData
 
    Private m_IdSub As New List(Of SelData)
    Private m_SelGrpId As Integer = GDB_ID.NULL
+   Private Const AUX_ID As String = "AuxId"
 
    Friend Sub ClearIdSub()
       RemoveSelGroup()
@@ -32,6 +33,8 @@ Module SelData
       Dim i As Integer = 0
       Do While i < m_IdSub.Count() - 1
          If Not EgtIsSelectedObj( m_IdSub( i).m_nId) Then
+            Dim nAuxId As Integer = GDB_ID.NULL
+            If EgtGetInfo( m_IdSub( i).m_nSel, AUX_ID, nAuxId) Then EgtErase( nAuxId)
             EgtErase( m_IdSub( i).m_nSel)
             m_IdSub.RemoveAt( i)
          Else
@@ -56,6 +59,8 @@ Module SelData
       ' Ricerca ed eliminazione del record con la coppia Id,Sub da rimuovere
       For i As Integer = 0 To m_IdSub.Count() - 1
          If m_IdSub( i).m_nId = nId And m_IdSub( i).m_nSub = nSub Then
+            Dim nAuxId As Integer = GDB_ID.NULL
+            If EgtGetInfo( m_IdSub( i).m_nSel, AUX_ID, nAuxId) Then EgtErase( nAuxId)
             EgtErase( m_IdSub( i).m_nSel)
             m_IdSub.RemoveAt( i)
             Exit For
@@ -68,6 +73,8 @@ Module SelData
       ' Ricerca ed eliminazione di record con identificativo da rimuovere
       For i As Integer = m_IdSub.Count() - 1 To 0 Step -1
          If m_IdSub( i).m_nId = nId Then
+            Dim nAuxId As Integer = GDB_ID.NULL
+            If EgtGetInfo( m_IdSub( i).m_nSel, AUX_ID, nAuxId) Then EgtErase( nAuxId)
             EgtErase( m_IdSub( i).m_nSel)
             m_IdSub.RemoveAt( i)
          End If
@@ -153,6 +160,11 @@ Module SelData
          For nCrvId As Integer = nFirstId + 1 To nFirstId + nCount - 1
             EgtErase( nCrvId)
          Next
+         Dim ptZM As New Point3d()
+         EgtAtParamPoint( nFirstId, 0.5, m_SelGrpId, ptZM)
+         Dim nSpheId = EgtCreateSurfTmSphere( m_SelGrpId, ptZM, 1, 0.1, GDB_RT.LOC)
+         EgtSetColor( nSpheId, New Color3d( 255, 0,0))
+         EgtSetInfo( nFirstId, AUX_ID, nSpheId)
       End If
       If bEnMod Then EgtEnableModified()
       Return nFirstId