-aggiunto pulsante per info già presenti

-aggiunto selezione in scena e apertura in albero -sitemato accensione luce
-aggiunto multi riga su info
2024-11-20 08:10:50 +01:00 · 2024-10-09 14:42:27 +02:00 · 2024-10-01 14:13:55 +02:00
67 changed files with 1219 additions and 2807 deletions
@@ -1,5 +1,7 @@
 Imports System.Collections.ObjectModel
 Imports System.ComponentModel
+Imports EgtUILib
+Imports EgtUILib.EgtInterface

 ' Classe che definisce un elemento di base del TreeView
 Public Class TreeViewItemBase
@@ -31,7 +33,7 @@ Public Class TreeViewItemBase
      End Set
   End Property

-   Private m_isExpanded As Boolean
+   Friend m_isExpanded As Boolean
   Public Property IsExpanded As Boolean
      Get
         Return m_isExpanded
@@ -39,6 +41,25 @@ Public Class TreeViewItemBase
      Set(value As Boolean)
         If (value <> m_isExpanded) Then
            m_isExpanded = value
+            If Not Map.refProjectVM.bSelObjOnScene Then
+               Dim m_onldObjTreeOldId As Integer = Map.refManageLayerExpanderVM.m_nObjTreeOldId
+               If Not m_isExpanded Then
+               Else
+                  For Each Item As LayerTreeViewItem In Map.refManageLayerExpanderVM.LayerList
+                     For Each LayerItem As LayerTreeViewItem In Item.Items
+                        If m_isExpanded = LayerItem.m_isExpanded Then
+                           If m_onldObjTreeOldId = LayerItem.Id Then
+                              Map.refProjectVM.SetLastInteger(LayerItem.Id)
+                              Map.refProjectVM.ExecuteCommand(Controller.CMD.DESELECTPARTLAYEROBJ)
+                           Else
+                              Map.refManageLayerExpanderVM.SelectIdInObjTree(LayerItem.Id)
+                              'Map.refProjectVM.ExecuteCommand(Controller.CMD.SETCURRPARTLAYER)
+                           End If
+                        End If
+                     Next
+                  Next
+               End If
+            End If
            NotifyPropertyChanged("IsExpanded")
         End If
      End Set
@@ -92,6 +113,7 @@ Public Class InheritableTreeViewItem
   Implements INotifyPropertyChanged

   Friend m_Name As String
+
   Public Property Name As String
      Get
         Return m_Name
@@ -195,7 +217,6 @@ Public Class ParentItem
   Inherits TreeViewItemBase

   Private m_sPictureString As String
-   Private m_Items As ObservableCollection(Of ChildItem)

   Public Property PictureString As String
      Get
@@ -209,6 +230,7 @@ Public Class ParentItem
      End Set
   End Property

+   Private m_Items As ObservableCollection(Of ChildItem)
   Public Property Items As ObservableCollection(Of ChildItem)
      Get
         Return m_Items
@@ -255,4 +277,4 @@ Public Class ChildItem
      MyBase.New(Name, IsSelected, IsExpanded, IsActive)
   End Sub

-End Class
+End Class
@@ -9,157 +9,90 @@

   <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
      <Expander Name="Draw2D" Style="{StaticResource ExpanderStyle}" Grid.Row="0"
-                IsExpanded="{Binding Draw2DIsExpanded}">
+         IsExpanded="{Binding Draw2DIsExpanded}">
         <Expander.Header>
            <TextBlock Text="{Binding Draw2DMsg}"/>
         </Expander.Header>
         <UniformGrid Columns="3">
-            <Button x:Name="PuntoBtn" ToolTip="Punto" Style="{StaticResource DrawPanelButton}"
-                    Command="{Binding PointBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Point+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Vettore" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding PointVectorCommand}">
-                        <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
-                     </Button>
-                     <Button ToolTip="Riferimento" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding PointReferenceCommand}">
-                        <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Linea 2 Punti" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Line2PBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Line2P+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Linea 2 Punti con Continuazione" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding Line2PContinuationCommand}">
-                        <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding Line2PToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Linea Punto Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding LinePDLBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/LinePDL+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Linea Punto Vettore Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding LinePDLVectorCommand}">
-                        <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding LinePDLToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/LinePDL.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ArcCSEToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/ArcCSE.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding Arc3PToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/Arc3P.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Arco " Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/ArcPDP+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Linea Punto Vettore Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding LinePDLVectorCommand}">
-                        <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding ArcPDPToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
+               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}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/Circle3P.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding Rectangle2PToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/Rectangle2P.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding PolygonToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/Polygon.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding PolygonSideToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Quota Lineare" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding LinearDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/LinearDimension+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Quota Allineata" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding AlignedDimensionCommand}">
-                        <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Quota Angolare" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding AngularDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/AngularDimension +.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Quota Angolare Avanzata" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding AlignedDimensionPlusCommand}">
-                        <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Quota Diametrale" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding DiamDimensionCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/DiametralDimension+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Quota Radiale" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding RadDimensionCommand}">
-                        <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding DiamRadDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding DiamRadDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Testo" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding TextBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Text+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Testo Avanzato" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding TextPlusCommand}">
-                        <Image Source="/Resources/DrawPanel/TextA.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
            </Button>
         </UniformGrid>
      </Expander>
@@ -169,135 +102,95 @@
            <TextBlock Text="{Binding Draw3DMsg}"/>
         </Expander.Header>
         <UniformGrid Columns="3">
-            <Button ToolTip="Piano Contornato" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding FloorCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
-               <Image Source="/Resources/DrawPanel/Plane+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Regione Piana" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding RegionCommand}">
-                        <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ExtrudeToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
               <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding RevolveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
               <Image Source="/Resources/DrawPanel/Revolve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ScrewToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
               <Image Source="/Resources/DrawPanel/Screw.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding SweptToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
               <Image Source="/Resources/DrawPanel/Swept.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding RuledToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
               <Image Source="/Resources/DrawPanel/Ruled.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding SolidAddSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/SolidAddSurf.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Sottrai Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SubtractSurfacesCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/SolidSubtractSurf+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Taglia Superficie con Superficie Inversa" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding CutSurfacesCommand}">
-                        <Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding SolidSubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Interseca Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding IntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/SolidIntersectSurf+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Taglia Superficie con Superficie" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding CutSurfCommand}">
-                        <Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding SolidIntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding IntersectSurfSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/IntersectSurfSurf.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ExtractLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ExtractLoops.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ExtractFacetLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ExtractFacetLoops.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Esplodi Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExplodeSurfaceCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/ExplodeSurf+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Esplodi Superfici Mesh in Triangoli" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding ExplodeSurfaceMeshCommand}">
-                        <Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding ExplodeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ExtractSurfFacetToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ExtractSurfFacet.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding MergeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/MergeSurf.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding InvertSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/InvertSurf.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ApproxSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Muovi Vertice di Superficie" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding MoveStmVertexCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/StmMoveVertex+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Muovi Faccia di Superficie" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding MoveStmFacetCommand}">
-                        <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding StmMoveVertexFacetToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
            </Button>
         </UniformGrid>
      </Expander>
@@ -307,22 +200,14 @@
         </Expander.Header>
         <UniformGrid Columns="3">
            <Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Cambia Layer" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeLayerBaseCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/ChangeLayer+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Cambia Layer con Trasformazioni" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding ChangeLayerTrasfCommand}">
-                        <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding ChangeLayerToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
@@ -330,159 +215,108 @@
               <Image Source="/Resources/DrawPanel/ChangeStatus.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ChangeColor.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ChangeAlphaToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ChangeColorAlpha.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ResetColorToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/RemoveColor.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding InvertCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ChangeStartToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True" 
-                    Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True" 
+               Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ExtendCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ExtendCurve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding BreakCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/BreakCurve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding SplitCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/SplitCurve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ExplodeCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ExplodeCurve.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Unisci Curve" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding JoinCurveBasCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
-               <Image Source="/Resources/DrawPanel/JoinCurve+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Unisci Curve creando una Copia" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding JoinCurveCopyCommand}">
-                        <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
-                     </Button>
-                     <Button ToolTip="Fondi Curve nella Composita" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding JoinCurveCompositeCommand}">
-                        <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding JoinCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Offset.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding FilletToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Fillet.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ChamferToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
            </Button>
-            <Button ToolTip="Arco Capovolto" Style="{StaticResource DrawPanelButton}"
-                    Command="{Binding UpsideDownArchCommand}" ToolTipService.ShowOnDisabled="True" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/ArcFlip+.png" Stretch="Uniform"/>
-               <Button.ContextMenu >
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Arco Esplementare" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding ComplementaryArchCommand}">
-                        <Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+            <Button ToolTip="{Binding ArcFlipToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button ToolTip="Aggiungi Punto" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding AddPointCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/AddPointCurve+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Trasforma in Arco" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding TrasformArcCommand}">
-                        <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-                     </Button>
-                     <Button ToolTip="Chiudi Curva Composita" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding CloseCurveCommand}">
-                        <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
-            </Button>
-            <Button ToolTip="Rimuovi Punto" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding RemoveCurveCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/RemovePointCurve+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Trasforma in Retta" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding TrasformRectCommand}">
-                        <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
-                     </Button>
-                     <Button ToolTip="Apri Curva Composita" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding OpenCurveCommand}">
-                        <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
-            </Button>
-            <Button ToolTip="Approssima Curva" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ApproxCurveBaseCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/ApproxCurve+.png" Stretch="Uniform"/>
-               <Button.ContextMenu>
-                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                     <Button ToolTip="Approssima Curva con Linee" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding ApproxCurveLineCommand}">
-                        <Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
+             </Button>
+             <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                ToolTipService.ShowOnDisabled="True"
+                Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
+                <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+             </Button>
+             <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                ToolTipService.ShowOnDisabled="True"
+                Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
+                <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+             </Button>
+            <Button ToolTip="{Binding ApproxCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ModifyArcRadiusToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ModifyArcRadius.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ModifyTextToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ModifyText.png" Stretch="Uniform"/>
            </Button>
         </UniformGrid>
@@ -493,8 +327,8 @@
         </Expander.Header>
         <UniformGrid Columns="3">
            <Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
            </Button>
            <Button Style="{StaticResource DrawPanelButton}"
@@ -502,33 +336,33 @@
            <Button Style="{StaticResource DrawPanelButton}"
                    Visibility="Hidden"/>
            <Button ToolTip="{Binding RotateToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding MirrorToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Mirror.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ScaleToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Scale.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding Rotate3DToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Rotate3D.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding Mirror3DToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Mirror3D.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding Scale3DToolTip}" Style="{StaticResource DrawPanelButton}"
-                    ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/Scale3D.png" Stretch="Uniform"/>
            </Button>
         </UniformGrid>
@@ -1035,66 +1035,6 @@
  <ItemGroup>
    <Resource Include="Resources\DrawPanel\StmMoveVertex.png" />
  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\Point+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\Line2P+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\LinePDL+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\ArcPDP+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\Text+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\TextA.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\ArcFlip+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\LinearDimension+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\AngularDimension +.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\DiametralDimension+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\Plane+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\SolidSubtractSurf+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\SolidIntersectSurf+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\ExplodeSurf+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\StmMoveVertex+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\ChangeLayer+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\JoinCurve+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\AddPointCurve+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\RemovePointCurve+.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\DrawPanel\ApproxCurve+.png" />
-  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
@@ -3,6 +3,7 @@
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:local="clr-namespace:EgtCAM5"
      DockPanel.Dock="Left">
-
+   
   <local:DrawPanelV DataContext="{StaticResource DrawPanelViewModel}"/>
+   
 </Grid>
@@ -106,7 +106,7 @@ Public Class MyMachGroupPanelVM
      Else
         ' se ci sono gruppi di lavorazione
         If bMachGroup Then
-            nGroupId = EgtGetFirstMachGroup()
+            nGroupId = EgtGetLastMachGroup()
            Return If(EgtSetCurrMachGroup(nGroupId), 0, 1)
         ' se altrimenti ammessi gruppi di lavoro vuoti
         ElseIf bAllowEmpty Then
@@ -1,16 +1,15 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:local="clr-namespace:EgtCAM5"
-                            Title="{Binding Title}" Icon="{Binding IconSource}"
-                            TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
-                            BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
-                            MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
-                            AboutBoxCommand="{Binding AboutBoxCommand}"
-                            AllowDrop="True" Drop="MainWindow_Drop"
-                            SnapsToDevicePixels="True"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   xmlns:local="clr-namespace:EgtCAM5"
+   Title="{Binding Title}" Icon="{Binding IconSource}"
+   TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
+   BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
+   MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
+   AboutBoxCommand="{Binding AboutBoxCommand}"
+   AllowDrop="True" Drop="MainWindow_Drop"
   CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
   <EgtWPFLib5:EgtCustomWindow.TitlePanel>
      <local:TopCommandBarV DataContext="{StaticResource TopCommandBarViewModel}"/>
@@ -16,7 +16,6 @@ Public Class MainWindowVM
   Private m_sDataRoot As String = String.Empty
   Private m_sConfigDir As String = String.Empty
   Private m_OnTerminateProcessCallback As New OnTerminateProcessCallback(AddressOf OnTerminateProcess)
-   Private m_IndexTab As Integer = 0

   ' EGALTECH ENVIRONMENT FIELDS WITH PROPERTY

@@ -386,8 +385,8 @@ Public Class MainWindowVM
         EgtSetLockId(sLockId)
      End If
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2611, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2611, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2609, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2609, 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
@@ -601,7 +600,7 @@ Public Class MainWindowVM
      ElseIf e.Key = Key.Left OrElse e.Key = Key.Right OrElse e.Key = Key.Up OrElse e.Key = Key.Down AndAlso
             Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
         Map.refMachiningParameterExpanderVM.FocusSlider()
-         Dim nStep As Integer = If(e.Key = Key.Right OrElse e.Key = Key.Up, 1, -1)
+         Dim nStep As Integer = If( e.Key = Key.Right OrElse e.Key = Key.Up, 1, -1)
         Map.refMachiningParameterExpanderVM.SetSliderValue(nStep)
         e.Handled = True
      End If
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.6.11.1")>
-<Assembly: AssemblyFileVersion("2.6.11.1")>
+<Assembly: AssemblyVersion("2.6.9.1")>
+<Assembly: AssemblyFileVersion("2.6.9.1")>

@@ -3,12 +3,12 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

   <Expander IsExpanded="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}"
-      Style="{StaticResource ExpanderStyle}">
+             Style="{StaticResource ExpanderStyle}">
      <Expander.Header>
         <TextBlock Text="{Binding PropertiesMsg}"/>
      </Expander.Header>
      <UniformGrid>
-         <TextBox Text="{Binding InfoBox, Mode=OneWay}" MaxHeight="250" IsReadOnly="True"
+         <TextBox Text="{Binding InfoBox, Mode=OneWay}" MaxHeight="100" IsReadOnly="True"
                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
      </UniformGrid>
   </Expander>
@@ -1,9 +1,11 @@
 <UserControl x:Class="InputExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">

   <Expander Header="{Binding Title}" IsExpanded="{Binding IsExpanded}" IsEnabled="{Binding IsEnabled}"
-      Style="{StaticResource ExpanderStyle}">
+             Style="{StaticResource ExpanderStyle}">
      <StackPanel>
         <StackPanel.Style>
            <Style TargetType="{x:Type StackPanel}">
@@ -16,26 +18,75 @@
         </StackPanel.Style>
         <TextBlock Text="{Binding TextBlock}"
                    Visibility="{Binding TextVisibility}" Margin="5,5,0,5"/>
-         <TextBox Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"
-                  Visibility="{Binding TextVisibility}" Margin="5,0,5,5">
-            <TextBox.InputBindings>
-               <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
-               <KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>
-            </TextBox.InputBindings>
-         </TextBox>
+         <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <TextBox x:Name="Txt" Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"  
+                     PreviewKeyDown="TextBox_PreviewKeyDown" Height="Auto"
+                     Visibility="{Binding TextVisibility}" Margin="5,0,5,5" >
+               <TextBox.InputBindings>
+                  <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
+                  <KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>
+               </TextBox.InputBindings>
+            </TextBox>
+            <Button Grid.Column="1" 
+                    Content="+"
+                    Command="{Binding ShowInfoItemCommand}"
+                    Visibility="Collapsed"
+                    Width="20"
+                    Height="20"
+                    Margin="5,-1,5,0" 
+                    VerticalAlignment="Top"/>
+            <!--Visibility="{Binding ShowInfoItemVisibility}"-->
+         </Grid>
         <CheckBox Content="{Binding CheckBoxText}" IsChecked="{Binding IsChecked}"
                   Visibility="{Binding CheckVisibility}" Margin="5,0,5,5"/>
         <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
-                   Visibility="{Binding ComboVisibility}" Margin="5,0,5,5"/>
+                   Visibility="{Binding ComboVisibility}" Margin="5,5,5,5"/>
+
+         <ItemsControl ItemsSource="{Binding InfoList}"
+                       Visibility="{Binding InfoVisibility}"
+                       Margin="5,5,0,10">
+            <ItemsControl.ItemTemplate>
+               <DataTemplate>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Text="{Binding Key}"
+                                Width="70"
+                                Margin="0,6,-15,0"/>
+                     <TextBox Grid.Column="1" 
+                              Text="{Binding Valour, UpdateSourceTrigger=PropertyChanged}"
+                              Margin="0,5,5,10">
+                        <TextBox.InputBindings>
+                           <KeyBinding Key="Enter" Command="{Binding DoneInfoCommand}"/>
+                        </TextBox.InputBindings>
+                     </TextBox>
+                     <Button Grid.Column="2" 
+                             Content="-"
+                             Command="{Binding RemoveInfoItemCommand}"
+                             Width="20"
+                             Height="20"
+                             Margin="5,-2,5,5"/>
+                  </Grid>
+               </DataTemplate>
+            </ItemsControl.ItemTemplate>
+         </ItemsControl>
+
         <Grid Margin="5,0,5,5">
            <Grid.ColumnDefinitions>
               <ColumnDefinition Width="1*"/>
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>
            <Button Command="{Binding ShowCommand}" Visibility="{Binding ShowBtnVisibility}"
-               Content="{Binding ShowMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
+                    Content="{Binding ShowMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
            <Button Command="{Binding DoneCommand}" Grid.Column="1"
-               Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
+                    Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
         </Grid>
      </StackPanel>
   </Expander>
@@ -1,3 +1,11 @@
 Public Class InputExpanderV

+   Private Sub TextBox_PreviewKeyDown(sender As Object, e As KeyEventArgs)
+      If e.Key = Key.Enter And Keyboard.Modifiers = ModifierKeys.Shift Then
+         Txt.AcceptsReturn = True
+         Txt.TextWrapping = TextWrapping.Wrap
+         Txt.AppendText(Environment.NewLine)
+      End If
+   End Sub
+
 End Class
@@ -1,11 +1,29 @@
 Imports System.Collections.ObjectModel
 Imports EgtUILib
+Imports MS.Internal

 Public Class InputExpanderVM
   Inherits ViewModelBase

 #Region "FIELDS & PROPERTIES"

+   ' Variabile temporanea per salvare bShow
+   Private m_tmpbShow As Boolean
+
+   Private m_tmpInfoList As New ObservableCollection(Of InfoItem)
+   ''' <summary>
+   ''' Lista temporanea delle info
+   ''' </summary>
+   Private Property tmpInfoList As ObservableCollection(Of InfoItem)
+      Get
+         Return m_tmpInfoList
+      End Get
+      Set(value As ObservableCollection(Of InfoItem))
+         m_tmpInfoList = value
+         OnPropertyChanged("tmpInfoList")
+      End Set
+   End Property
+
   ' Expander fields
   Private m_IsExpanded As Boolean
   Public Property IsExpanded As Boolean
@@ -140,15 +158,47 @@ Public Class InputExpanderVM
      End Set
   End Property

+   Private m_InfoList As New ObservableCollection(Of InfoItem)
+   ''' <summary>
+   ''' Lista delle info modificate
+   ''' </summary>
+   Public Property InfoList As ObservableCollection(Of InfoItem)
+      Get
+         Return m_InfoList
+      End Get
+      Set(value As ObservableCollection(Of InfoItem))
+         m_InfoList = value
+         OnPropertyChanged("InfoList")
+      End Set
+   End Property
+
   Private m_ComboSelectedIndex As Integer
   Public Property ComboSelectedIndex As Integer
      Get
         Return m_ComboSelectedIndex
      End Get
      Set(value As Integer)
-         Map.refProjectVM.SetLastInteger(value)
+         If m_tmpbShow Then Map.refProjectVM.SetLastInteger(value)
         m_ComboSelectedIndex = value
+         ' Assegno l'indice selezionato ad una variabile temporanea per utilizzarlo quando rimuovo l'info dalla lista
+         Dim tmpComboSelectedIndex As Integer = ComboSelectedIndex
+         ' Controllo se l'indice è maggiore o uguale a zero e la lista tmp contiene valori
+         If m_ComboSelectedIndex >= 0 AndAlso tmpInfoList.Count > 0 Then
+            ' Controllo se la info è contenuta nella lista ComboItemsList
+            If ComboItemsList.Contains(tmpInfoList(m_ComboSelectedIndex).sKey) Then
+               ' Aggiungo la info alla lista per visualizzarla
+               InfoList.Add(New InfoItem(tmpInfoList(m_ComboSelectedIndex).nId, tmpInfoList(m_ComboSelectedIndex).sKey, m_tmpInfoList(m_ComboSelectedIndex).sValour))
+               ' Nascondo la combobox
+               ComboVisibility = Visibility.Collapsed
+               ' Rimuovo la info dalla ComboItemsList
+               ComboItemsList.Remove(tmpInfoList(m_ComboSelectedIndex).sKey)
+            End If
+            ' Rimuovo la info dalla tmpInfoList
+            tmpInfoList.Remove(tmpInfoList(tmpComboSelectedIndex))
+         End If
         OnPropertyChanged("ComboSelectedIndex")
+         OnPropertyChanged("ComboItemsList")
+         OnPropertyChanged("InfoList")
      End Set
   End Property

@@ -177,9 +227,43 @@ Public Class InputExpanderVM
      End Set
   End Property

+   Private m_ShowInfoItemVisibility As Visibility
+   ''' <summary>
+   ''' Propietà visibilità bottone +
+   ''' </summary>
+   Public Property ShowInfoItemVisibility As Visibility
+      Get
+         Return m_ShowInfoItemVisibility
+      End Get
+      Set(value As Visibility)
+         If value <> m_ShowInfoItemVisibility Then
+            m_ShowInfoItemVisibility = value
+            OnPropertyChanged("ShowInfoItemVisibility")
+         End If
+      End Set
+   End Property
+
+   Private m_InfoVisibility As Visibility
+   ''' <summary>
+   ''' Propietà visibilità lista info modificate
+   ''' </summary>
+   Public Property InfoVisibility As Visibility
+      Get
+         Return m_InfoVisibility
+      End Get
+      Set(value As Visibility)
+         If value <> m_InfoVisibility Then
+            m_InfoVisibility = value
+            OnPropertyChanged("InfoVisibility")
+         End If
+      End Set
+   End Property
+
   ' Commands definition
   Private m_cmdShow As ICommand
   Private m_cmdDone As ICommand
+   Private m_cmdShowInfoItem As ICommand
+   Private m_cmdRemoveInfoItem As ICommand

 #Region "Messages"

@@ -257,6 +341,15 @@ Public Class InputExpanderVM
   ''' Execute the Point.  This method is invoked by the PointCommand.
   ''' </summary>
   Public Sub Done(ByVal param As Object)
+      ' Controllo se la lista contenente la info modificata sia presente
+      If InfoList.Count > 0 Then
+         ' Ciclo sulla lista
+         For Each Item As InfoItem In InfoList
+            Map.refProjectVM.NotifyInputText((Item.Key & "=" & Item.Valour).Trim())
+            ' Assegno a m_TextBox la info modificata
+            m_TextBox &= vbCrLf & (Item.Key & "=" & Item.Valour).Trim() & vbCrLf
+         Next
+      End If
      Map.refProjectVM.Done(m_TextBox)
   End Sub

@@ -269,6 +362,30 @@ Public Class InputExpanderVM

 #End Region ' DoneCommand

+#Region "ShowInfoItemCommand"
+
+   ''' <summary>
+   ''' Comando per la visualizzazione della combobox
+   ''' </summary>
+   Public ReadOnly Property ShowInfoItemCommand As ICommand
+      Get
+         If m_cmdShowInfoItem Is Nothing Then
+            m_cmdShowInfoItem = New Command(AddressOf ShowInfoItem)
+         End If
+         Return m_cmdShowInfoItem
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Funzione per la visualizzazione della combobox
+   ''' </summary>
+   ''' <param name="param"></param>
+   Public Sub ShowInfoItem(ByVal param As Object)
+      ComboVisibility = Visibility.Visible
+   End Sub
+
+#End Region    ' ShowInfoItemCommand
+
 #End Region

 #Region "METHODS"
@@ -279,13 +396,37 @@ Public Class InputExpanderVM
         TextBlock = PrepareInputBoxParam.sLabel
         TextBox = ""
         TextVisibility = Visibility.Visible
+         ' Controllo se il titolo è uguale a INFO se si
+         If Title = EgtMsg(5359).ToUpper() Then
+            ' Metto tmpbShow a false
+            m_tmpbShow = False
+            ' Rendo visibile il pulsante che mostra la lista delle info
+            ShowInfoItemVisibility = Visibility.Visible
+            ' Rendo visibile la lista delle info selezionate
+            InfoVisibility = Visibility.Visible
+            ' Pulisco la lista tmpInfoList
+            tmpInfoList.Clear()
+            ' Pulisco la lista InfoList
+            InfoList.Clear()
+            ' Pulisco la lista ComboItemsList
+            ComboItemsList.Clear()
+            ' Popolo la lista ComboItemsList
+            ComboInfo()
+         End If
      End If
      If PrepareInputBoxParam.sCheckLabel <> "" Then
         CheckBoxText = PrepareInputBoxParam.sCheckLabel
         CheckVisibility = Visibility.Visible
      End If
      If PrepareInputBoxParam.bShowCombo Then
+         ' Assegno a tmpbShow PrepareInputBoxParam.bShowCombo
+         m_tmpbShow = PrepareInputBoxParam.bShowCombo
+         ' Pulisco la lista ComboItemsList
         ComboItemsList.Clear()
+         ' Pulisco la lista tmpInfoList
+         tmpInfoList.Clear()
+         ' Pulisco la lista InfoList
+         InfoList.Clear()
         ComboVisibility = Visibility.Visible
      End If
      If PrepareInputBoxParam.bShowBtn Then
@@ -302,6 +443,8 @@ Public Class InputExpanderVM
      CheckVisibility = Visibility.Collapsed
      ComboVisibility = Visibility.Collapsed
      ShowBtnVisibility = Visibility.Collapsed
+      ShowInfoItemVisibility = Visibility.Collapsed
+      InfoVisibility = Visibility.Collapsed
      IsExpanded = False
      IsEnabled = False
   End Sub
@@ -329,12 +472,44 @@ Public Class InputExpanderVM

   Private Function AddInputBoxCombo(ByVal sText As String, ByVal bSelected As Boolean) As Boolean
      ComboItemsList.Add(sText)
+
      If bSelected Then
         ComboSelectedIndex = ComboItemsList.Count - 1
      End If
      Return True
   End Function

+   ''' <summary>
+   ''' Rimovi nota da info lista
+   ''' </summary>
+   ''' <param name="InfoItem">Informazione da eliminare</param>
+   Friend Sub RemoveItemInfo(InfoItem As InfoItem)
+      ' Rimuovo info da lista modifica
+      InfoList.Remove(InfoItem)
+      ' Riaggiungo la info eliminata
+      ComboItemsList.Add(InfoItem.sKey)
+      ' Riaggiungo la info eliminata
+      tmpInfoList.Add(InfoItem)
+   End Sub
+
+   ''' <summary>
+   ''' Funzione che popola la lista ComboItemsList
+   ''' </summary>
+   Private Sub ComboInfo()
+      '''''''''''''''''''''''''''''' Recuperare funzione egtgetallinfo quando sarà pronta
+      Dim val As Integer
+      If Not m_tmpbShow Then
+         For Ind As Integer = 0 To 6
+            val += Ind
+            tmpInfoList.Add(New InfoItem(Ind, "A" & +Ind, val.ToString()))
+         Next
+
+         For Each InfoItem As InfoItem In tmpInfoList
+            ComboItemsList.Add(InfoItem.sKey)
+         Next
+      End If
+   End Sub
+
 #End Region    ' Methods

 End Class
@@ -69,7 +69,7 @@ Public Class LayerTreeViewItem
         Return m_bOnOff
      End Get
      Set(value As Boolean)
-         If Map.refProjectVM.GetController().GetStep() <> 0 Then Return
+         'If Map.refProjectVM.GetController().GetStep() <> 0 Then Return
         If m_bOnOff <> value Then
            m_bOnOff = value
            ' se abilitato, eseguo operazione
@@ -20,8 +20,8 @@
            <Button Content="{Binding NewLayerMsg}" Command="{Binding NewLayerCommand}"  Height="30"/>
            <Button Content="{Binding ColorMsg}" Command="{Binding LayerColorCommand}"  Height="30"/>
         </UniformGrid>
-         
-         <TreeView Name="LayerTreeView" MinHeight="250" MaxHeight="400" 
+
+         <TreeView x:Name="LayerTreeView" MinHeight="150" MaxHeight="250" 
                   ItemsSource="{Binding Path=LayerList}"
                   VirtualizingStackPanel.IsVirtualizing = "True"
                   VirtualizingStackPanel.VirtualizationMode = "Recycling">
@@ -50,8 +50,8 @@
                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>

-                     <ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}" Grid.Column="0"
-                                   IsChecked="{Binding OnOff}" Visibility="{Binding IsHidden}" Focusable="False" Height="15" Width="15" Margin="0,0,5,0"/>
+                     <ToggleButton Style="{StaticResource EgtCAM5_LampToggleButton}" Grid.Column="0" 
+                                   IsChecked="{Binding OnOff}" Visibility="{Binding IsHidden}" Focusable="True" Height="15" Width="15" Margin="0,0,5,0"/>
                     <Image Grid.Column="1" Source="{Binding PictureString}" Height="15" Margin="0,0,5,0"/>
                     <TextBlock Grid.Column="2" Text="{Binding Name}" Margin="0,0,5,0"/>
                     <Ellipse Grid.Column="3" Height="10" Width="10" Fill="{Binding LayerColor}" />
@@ -61,7 +61,7 @@
            </TreeView.Resources>

            <!--Style dei nodi CathegoryItem che li riquadra di azzurro quando clicckati ed elimina l'ombra grigia 
-            che si presenta quando la categoria rimane vuota (ombra causata dal multibinding).--> 
+            che si presenta quando la categoria rimane vuota (ombra causata dal multibinding).-->
            <TreeView.ItemContainerStyle>
               <Style TargetType="{x:Type TreeViewItem}">
                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -528,7 +528,7 @@ Public Class ManageLayerExpanderVM
 #Region "METHODS"

   Private WithEvents ObjTreeTimer As New System.Windows.Threading.DispatcherTimer
-   Private m_nObjTreeOldId As Integer = GDB_ID.NULL
+   Friend m_nObjTreeOldId As Integer = GDB_ID.NULL
   Private m_nObjTreeMenuId As Integer = GDB_ID.NULL
   Private m_bEnableUpdateObjInObjTree As Boolean = True

@@ -1,30 +1,15 @@
 <UserControl x:Class="DrawOptionPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">

-   <!--<StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
-      --><!--ContentPresenter that contains the ManageLayerExpander--><!--
-      <ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
-      --><!--ContentPresenter that contains the InfoExpander--><!--
-      <ContentPresenter Content="{Binding InfoExpander}"/>
-      --><!--ContentPresenter that contains the InputExpander--><!--
-      <ContentPresenter Content="{Binding InputExpander}"/>
-   </StackPanel>-->
-   <Grid Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
+   <StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
      <!--ContentPresenter that contains the ManageLayerExpander-->
      <ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
-      <GridSplitter Grid.Row="0" Height="5" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"/>
      <!--ContentPresenter that contains the InfoExpander-->
-      <ContentPresenter Grid.Row="1" Content="{Binding InfoExpander}"/>
-      <GridSplitter Grid.Row="1" Height="5" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"/>
+      <ContentPresenter Content="{Binding InfoExpander}"/>
      <!--ContentPresenter that contains the InputExpander-->
-      <ContentPresenter Grid.Row="2" Content="{Binding InputExpander}"/>
-   </Grid>
+      <ContentPresenter Content="{Binding InputExpander}"/>
+   </StackPanel>

 </UserControl>
@@ -281,7 +281,6 @@ Public Class DispositionParameterExpanderVM
      End Select
      Map.refRawPartOptionVM.SetMoveWithFixture(False)
      Map.refFixtureParametersVM.UpdateFixtureTypeList()
-      DispositionUtility.InitHookData()
   End Sub

 #End Region    ' METHODS
@@ -5,6 +5,8 @@ Imports EgtUILib
 Public Class FixtureParametersVM
   Inherits ViewModelBase

+   Friend Const USED As String = "USED"
+
   Private m_FixtureTypeList As ObservableCollection(Of FixtureListItem)
   Public ReadOnly Property FixtureTypeList As ObservableCollection(Of FixtureListItem)
      Get
@@ -120,35 +122,27 @@ Public Class FixtureParametersVM
         OnPropertyChanged("FixtureErrorMsg")
         Return
      End If
-      ' dimensioni tavola
-      Dim vtTabDim As Vector3d = ptTableMax - ptTableMin
      ' calcolo il centro della tavola
-      Dim ptTableMid As Point3d = Point3d.ORIG() + 0.5 * vtTabDim
+      Dim ptTableMid As New Point3d((ptTableMax.x - ptTableMin.x) / 2, (ptTableMax.y - ptTableMin.y) / 2, (ptTableMax.z - ptTableMin.z) / 2)
      ' posiziono il nuovo sottopezzo al centro della tavola
-      Dim nAddedFixtureId As Integer = EgtAddFixture(SelectedFixture.Name, ptTableMid, 0, 20)
+      Dim nAddedFixtureId As Integer = EgtAddFixture(SelectedFixture.Name, ptTableMid, 0, 0)
      If nAddedFixtureId = GDB_ID.NULL Then
         m_FixtureErrorMsg = "Impossibile posizionare la ventosa sulla tavola"
         OnPropertyChanged("FixtureErrorMsg")
         Return
      End If
-      ' Se la ventosa ha punti di hook da ancorare
+      ' verifico se la ventosa ha punti di hook da ancorare
      If IsFixtureWithHook(nAddedFixtureId) Then
         If Not PositionFixtureOnNearestHook(nAddedFixtureId) Then
-            EgtMoveFixture( nAddedFixtureId, 0.2 * vtTabDim.y * Vector3d.Y_AX())
-            If Not PositionFixtureOnNearestHook(nAddedFixtureId) Then
-               EgtMoveFixture( nAddedFixtureId, 0.2 * vtTabDim.y * Vector3d.Y_AX())
-               If Not PositionFixtureOnNearestHook(nAddedFixtureId) Then
-                  ' non ci sono punti liberi, quindi rimuovo la ventosa e segnalo
-                  EgtRemoveFixture(nAddedFixtureId)
-                  MessageBox.Show("No free hook point!", "ERROR")
-                  Return
-               End If
-            End If
+            ' non ci sono punti liberi, quindi rimuovo la ventosa e segnalo
+            EgtRemoveFixture(nAddedFixtureId)
+            MessageBox.Show("No free hook point!", "ERROR")
+            Return
         End If
-      ' altrimenti ventosa con movimento continuo
      Else
-         ' verifico se è in una posizione valida
-         If Not DispositionUtility.VerifyFixturePosition(nAddedFixtureId, New Vector3d) Then
+         ' se non ha punti di ancoraggio
+      ' verifico se è in una posizione valida
+      If Not DispositionUtility.VerifyFixturePosition(nAddedFixtureId, New Vector3d) Then
            ' se non trovo una posizione valida, esco
            If Not SearchOkFixturePosition(nAddedFixtureId, ptTableMin, ptTableMax, ptTableMid) Then
               Return
@@ -163,76 +157,76 @@ Public Class FixtureParametersVM

   ' Funzione che cerca una posizione valida per la ventosa libera di muoversi
   Private Function SearchOkFixturePosition(nAddedFixtureId As Integer, ptTableMin As Point3d, ptTableMax As Point3d, ptTableMid As Point3d) As Boolean
-      ' creo un gruppo temporaneo
-      Dim nTempGroupId As Integer = EgtCreateGroup(GDB_ID.ROOT)
-      EgtSetLevel(nTempGroupId, GDB_LV.USER)
-      EgtSetMode(nTempGroupId, GDB_MD.STD)
-      ' calcolo ingombro sottopezzo aggiunto
-      Dim bboxAddedFixture As New BBox3d
-      EgtGetBBoxGlob(nAddedFixtureId, GDB_BB.STANDARD, bboxAddedFixture)
-      ' calcolo bbox tavolo
-      Dim bboxTableArea As New BBox3d(ptTableMin, ptTableMax)
-      bboxTableArea.Expand(-bboxAddedFixture.DimX / 2, -bboxAddedFixture.DimY / 2, 0)
-      ' creo superficie delle misure della tavola
-      Dim nTableFrId As Integer = EgtCreateSurfFrRectangle(nTempGroupId, bboxTableArea.Min, bboxTableArea.Max)
-      ' ciclo su tutti i pezzi di questa fase
-      Dim nFixtureId As Integer = EgtGetFirstFixture()
-      While nFixtureId <> GDB_ID.NULL
-         ' creo il bbox del sottopezzo
-         Dim bboxFixture As New BBox3d
-         EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
-         ' faccio offset del bbox del sottopezzo per includere metà del sottopezzo da aggiungere
-         bboxFixture.Expand(bboxAddedFixture.DimX / 2, bboxAddedFixture.DimY / 2, 0)
-         ' lo porto all'altezza della tavola
-         Dim ptMinFixtureFr As New Point3d(bboxFixture.Min)
-         Dim ptMaxFixtureFr As New Point3d(bboxFixture.Max)
-         ptMinFixtureFr.z = ptTableMin.z
-         ptMaxFixtureFr.z = ptTableMin.z
-         ' creo la regione occupata dal bbox del sottopezzo
-         Dim nFixtureFrId As Integer = EgtCreateSurfFrRectangle(nTempGroupId, ptMinFixtureFr, ptMaxFixtureFr)
-         ' sottraggo la regione del sottopezzo da quella della tavola
-         Dim x = EgtSurfFrSubtract(nTableFrId, nFixtureFrId)
-         nFixtureId = EgtGetNextFixture(nFixtureId)
-      End While
-      ' creo gruppo con i bordi della regione di tavola avanzata
-      Dim TableFrBorderGroupId As Integer = EgtCreateGroup(nTempGroupId)
-      Dim nTableFrBorderCount As Integer = 0
-      Dim nChunk As Integer = EgtSurfFrChunkCount(nTableFrId)
-      For Index = 0 To nChunk - 1
-         EgtExtractSurfFrChunkLoops(nTableFrId, Index, TableFrBorderGroupId, nTableFrBorderCount)
-      Next
-      ' verifico se c'è almeno un bordo
-      If nTableFrBorderCount = 0 Then
-         m_FixtureErrorMsg = "Impossibile posizionare la ventosa sulla tavola"
-         OnPropertyChanged("FixtureErrorMsg")
-      Return False
-      End If
-      ' converto il punto medio della tavola in coordinate globali
-      Dim PtTableRef As Point3d
-      EgtGetTableRef(1, PtTableRef)
-      Dim frTableRef As New Frame3d(PtTableRef)
-      ptTableMid.ToGlob(frTableRef)
-      ' ciclo sui bordi per trovare il punto più vicino
-      Dim dMinDist As Double = (bboxTableArea.Max - bboxTableArea.Min).SqLenXY
-      Dim ptMinAbs As Point3d
-      Dim BorderId As Integer = EgtGetFirstInGroup(TableFrBorderGroupId)
-      While BorderId <> GDB_ID.NULL
-         Dim dDist As Double = 0
-         Dim ptMinRel As Point3d
-         Dim nSide As Integer = 0
-         EgtPointCurveDistSide(ptTableMid, BorderId, Vector3d.Z_AX, GDB_ID.ROOT, dDist, ptMinRel, nSide)
-         If dDist < dMinDist Then
-            dMinDist = dDist
-            ptMinAbs = ptMinRel
+         ' creo un gruppo temporaneo
+         Dim nTempGroupId As Integer = EgtCreateGroup(GDB_ID.ROOT)
+         EgtSetLevel(nTempGroupId, GDB_LV.USER)
+         EgtSetMode(nTempGroupId, GDB_MD.STD)
+         ' calcolo ingombro sottopezzo aggiunto
+         Dim bboxAddedFixture As New BBox3d
+         EgtGetBBoxGlob(nAddedFixtureId, GDB_BB.STANDARD, bboxAddedFixture)
+         ' calcolo bbox tavolo
+         Dim bboxTableArea As New BBox3d(ptTableMin, ptTableMax)
+         bboxTableArea.Expand(-bboxAddedFixture.DimX / 2, -bboxAddedFixture.DimY / 2, 0)
+         ' creo superficie delle misure della tavola
+         Dim nTableFrId As Integer = EgtCreateSurfFrRectangle(nTempGroupId, bboxTableArea.Min, bboxTableArea.Max)
+         ' ciclo su tutti i pezzi di questa fase
+         Dim nFixtureId As Integer = EgtGetFirstFixture()
+         While nFixtureId <> GDB_ID.NULL
+            ' creo il bbox del sottopezzo
+            Dim bboxFixture As New BBox3d
+            EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
+            ' faccio offset del bbox del sottopezzo per includere metà del sottopezzo da aggiungere
+            bboxFixture.Expand(bboxAddedFixture.DimX / 2, bboxAddedFixture.DimY / 2, 0)
+            ' lo porto all'altezza della tavola
+            Dim ptMinFixtureFr As New Point3d(bboxFixture.Min)
+            Dim ptMaxFixtureFr As New Point3d(bboxFixture.Max)
+            ptMinFixtureFr.z = ptTableMin.z
+            ptMaxFixtureFr.z = ptTableMin.z
+            ' creo la regione occupata dal bbox del sottopezzo
+            Dim nFixtureFrId As Integer = EgtCreateSurfFrRectangle(nTempGroupId, ptMinFixtureFr, ptMaxFixtureFr)
+            ' sottraggo la regione del sottopezzo da quella della tavola
+            Dim x = EgtSurfFrSubtract(nTableFrId, nFixtureFrId)
+            nFixtureId = EgtGetNextFixture(nFixtureId)
+         End While
+         ' creo gruppo con i bordi della regione di tavola avanzata
+         Dim TableFrBorderGroupId As Integer = EgtCreateGroup(nTempGroupId)
+         Dim nTableFrBorderCount As Integer = 0
+         Dim nChunk As Integer = EgtSurfFrChunkCount(nTableFrId)
+         For Index = 0 To nChunk - 1
+            EgtExtractSurfFrChunkLoops(nTableFrId, Index, TableFrBorderGroupId, nTableFrBorderCount)
+         Next
+         ' verifico se c'è almeno un bordo
+         If nTableFrBorderCount = 0 Then
+            m_FixtureErrorMsg = "Impossibile posizionare la ventosa sulla tavola"
+            OnPropertyChanged("FixtureErrorMsg")
+         Return False
         End If
-         BorderId = EgtGetNext(BorderId)
-      End While
-      ' sposto il sottopezzo nel punto trovato
-      Dim vtFixtureMove As Vector3d = ptMinAbs - ptTableMid
-      vtFixtureMove.z = 0
-      EgtMoveFixture(nAddedFixtureId, vtFixtureMove)
-      ' cancello il gruppo temporaneo
-      EgtErase(nTempGroupId)
+         ' converto il punto medio della tavola in coordinate globali
+         Dim PtTableRef As Point3d
+         EgtGetTableRef(1, PtTableRef)
+         Dim frTableRef As New Frame3d(PtTableRef)
+         ptTableMid.ToGlob(frTableRef)
+         ' ciclo sui bordi per trovare il punto più vicino
+         Dim dMinDist As Double = (bboxTableArea.Max - bboxTableArea.Min).SqLenXY
+         Dim ptMinAbs As Point3d
+         Dim BorderId As Integer = EgtGetFirstInGroup(TableFrBorderGroupId)
+         While BorderId <> GDB_ID.NULL
+            Dim dDist As Double = 0
+            Dim ptMinRel As Point3d
+            Dim nSide As Integer = 0
+            EgtPointCurveDistSide(ptTableMid, BorderId, Vector3d.Z_AX, GDB_ID.ROOT, dDist, ptMinRel, nSide)
+            If dDist < dMinDist Then
+               dMinDist = dDist
+               ptMinAbs = ptMinRel
+            End If
+            BorderId = EgtGetNext(BorderId)
+         End While
+         ' sposto il sottopezzo nel punto trovato
+         Dim vtFixtureMove As Vector3d = ptMinAbs - ptTableMid
+         vtFixtureMove.z = 0
+         EgtMoveFixture(nAddedFixtureId, vtFixtureMove)
+         ' cancello il gruppo temporaneo
+         EgtErase(nTempGroupId)
      Return True
   End Function

@@ -245,7 +239,9 @@ Public Class FixtureParametersVM
      ' leggo tipo 
      Dim sType As String = ""
      EgtGetInfo(nFixtHookId, DispositionUtility.TYPE, sType)
-      If sType.Equals(DispositionUtility.POINT) Then
+      If sType.Equals(DispositionUtility.FREE) Then
+         Return False
+      ElseIf sType.Equals(DispositionUtility.POINT) Then
         Return True
      ElseIf sType.Equals(DispositionUtility.LINE) Then
         Return True
@@ -254,7 +250,7 @@ Public Class FixtureParametersVM
      End If
   End Function

-   ' Funzione che cerca un hook libero adatto alla ventosa e se trovato la posiziona
+   ' Funzione che aggancia la ventosa al più vicino hook libero
   Friend Shared Function PositionFixtureOnNearestHook(nFixtureId As Integer) As Boolean
      ' cerco punto hook sulla ventosa
      Dim nFixtSolidId As Integer = EgtGetFirstNameInGroup(nFixtureId, SOLID)
@@ -266,21 +262,26 @@ Public Class FixtureParametersVM
      Dim nFixtHookType As DispositionUtility.HOOKTYPE = DispositionUtility.HOOKTYPE.FREE
      Dim sType As String = ""
      EgtGetInfo(nFixtHookId, DispositionUtility.TYPE, sType)
-      If sType.Equals(DispositionUtility.POINT) Then
+      If sType.Equals(DispositionUtility.FREE) Then
+         nFixtHookType = DispositionUtility.HOOKTYPE.FREE
+         ' esco perchè non devo cercare alcun punto
+         Return True
+      ElseIf sType.Equals(DispositionUtility.POINT) Then
         nFixtHookType = DispositionUtility.HOOKTYPE.POINT
      ElseIf sType.Equals(DispositionUtility.LINE) Then
         nFixtHookType = DispositionUtility.HOOKTYPE.LINE
      Else
+         nFixtHookType = DispositionUtility.HOOKTYPE.FREE
         ' esco perchè non devo cercare alcun punto
         Return True
      End If
      Dim nFixtHookClass As Integer = 0
      EgtGetInfo(nFixtHookId, DispositionUtility.CLASS_, nFixtHookClass)
-      ' Recupero Id tavola corrente
+      ' cerco id tavola
      Dim sTableName As String = ""
      EgtGetTableName(sTableName)
      Dim nTableId As Integer = EgtGetTableId(sTableName)
-      ' *** Cerco hook su tavola ***
+      ' cerco hook su tavola macchina
      Dim nTableSolidId As Integer = EgtGetFirstNameInGroup(nTableId, SOLID)
      Dim nCurrHookId As Integer = EgtGetFirstNameInGroup(nTableSolidId, DispositionUtility.HOOK)
      ' Punto di hook a cui spostare la ventosa
@@ -292,22 +293,33 @@ Public Class FixtureParametersVM
            EgtMoveFixture(nFixtureId, ptCurrHook - ptFixtHook)
            ' verifico se è in una posizione valida
            If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
-               If nFixtHookType = DispositionUtility.HOOKTYPE.POINT then
-                  DispositionUtility.SetHookUsed( nCurrHookId, nFixtureId)
-               Else
-                  DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
-               End If
+               EgtSetInfo(nCurrHookId, used, nFixtureId)
               Return True
-            Else
-               EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
            End If
         End If
         nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
      End While
-      ' *** Cerco hook su barre fisse ***
+      ' cerco hook su barra fissa
      Dim nTableFixedId As Integer = EgtGetFirstNameInGroup(nTableId, DispositionUtility.FIXED)
-      While nTableFixedId <> GDB_ID.NULL
-         nCurrHookId = EgtGetFirstNameInGroup(nTableFixedId, DispositionUtility.HOOK)
+      nCurrHookId = EgtGetFirstNameInGroup(nTableFixedId, DispositionUtility.HOOK)
+      While nCurrHookId <> GDB_ID.NULL
+         ' se punto di aggancio valido
+         If HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, ptCurrHook) Then
+            ' sposto la ventosa
+            EgtMoveFixture(nFixtureId, ptCurrHook - ptFixtHook)
+            ' verifico se è in una posizione valida
+            If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
+               EgtSetInfo(nCurrHookId, USED, nFixtureId)
+               Return True
+            End If
+         End If
+         nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
+      End While
+      ' cerco hook su barre mobili
+      Dim nMobileInd As Integer = 1
+      Dim nMobile As Integer = EgtGetFirstNameInGroup(nTableId, DispositionUtility.MOBILE & nMobileInd)
+      While nMobile <> GDB_ID.NULL
+         nCurrHookId = EgtGetFirstNameInGroup(nMobile, DispositionUtility.HOOK)
         While nCurrHookId <> GDB_ID.NULL
            ' se punto di aggancio valido
            If HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, ptCurrHook) Then
@@ -315,111 +327,46 @@ Public Class FixtureParametersVM
               EgtMoveFixture(nFixtureId, ptCurrHook - ptFixtHook)
               ' verifico se è in una posizione valida
               If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
-                  If nFixtHookType = DispositionUtility.HOOKTYPE.POINT then
-                     DispositionUtility.SetHookUsed( nCurrHookId, nFixtureId)
-                  Else
-                     DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
-                  End If
+                  EgtSetInfo(nCurrHookId, USED, nFixtureId)
                  Return True
-               Else
-                  EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
               End If
            End If
            nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
         End While
-         nTableFixedId = EgtGetNextName( nTableFixedId, DispositionUtility.FIXED)
-      End While
-      ' *** Cerco hook su barre mobili ***
-      Dim nBarId As Integer = EgtGetFirstGroupInGroup(nTableId)
-      While nBarId <> GDB_ID.NULL
-         Dim sBarName As String = ""
-         If EgtGetName( nBarId, sBarName) AndAlso EgtGetAxisId( sBarName) <> GDB_ID.NULL Then
-            nCurrHookId = EgtGetFirstNameInGroup(nBarId, DispositionUtility.HOOK)
-            While nCurrHookId <> GDB_ID.NULL
-               ' se punto di aggancio valido
-               If HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, ptCurrHook) Then
-                  ' sposto la ventosa
-                  Dim vtMove As Vector3d = ptCurrHook - ptFixtHook
-                  EgtMoveFixture(nFixtureId, vtMove)
-                  ' verifico se è in una posizione valida
-                  If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
-                     If nFixtHookType = DispositionUtility.HOOKTYPE.POINT then
-                        DispositionUtility.SetHookUsed( nCurrHookId, nFixtureId)
-                     Else
-                        DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
-                     End If
-                     Return True
-                  Else
-                     EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
-                  End If
-               End If
-               nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
-            End While
-            ' Cerco su eventuali carrelli
-            Dim nCharId As Integer = EgtGetFirstGroupInGroup(nBarId)
-            While nCharId <> GDB_ID.NULL
-               Dim sCharName As String = ""
-               If EgtGetName( nCharId, sCharName) AndAlso EgtGetAxisId( sCharName) <> GDB_ID.NULL Then 
-                  nCurrHookId = EgtGetFirstNameInGroup(nCharId, DispositionUtility.HOOK)
-                  While nCurrHookId <> GDB_ID.NULL
-                     ' se punto di aggancio valido
-                     If HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, ptCurrHook) Then
-                        ' sposto la ventosa
-                        EgtMoveFixture(nFixtureId, ptCurrHook - ptFixtHook)
-                        ' verifico se è in una posizione valida
-                        If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
-                           If nFixtHookType = DispositionUtility.HOOKTYPE.POINT then
-                              DispositionUtility.SetHookUsed( nCurrHookId, nFixtureId)
-                           Else
-                              DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
-                           End If
-                           Return True
-                        Else
-                           EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
-                        End If
-                     End If
-                     nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
-                  End While
-               End If
-               nCharId = EgtGetNextGroup(nCharId)
-            End While
-         End If
-         nBarId = EgtGetNextGroup(nBarId)
+         nMobileInd += 1
+         nMobile = EgtGetFirstNameInGroup(nTableId, DispositionUtility.MOBILE & nMobileInd)
      End While
      Return False
   End Function

-   ' Funzione che analizza l'hook e se valido ne restituisce la posizione (punto)
-   Private Shared Function HookAnalyzer(nCurrHookId As Integer, nFixtHookType As Integer, nFixtHookClass As Integer,
-                                        ptFixtHook As Point3d, ByRef ptCurrHook As Point3d) As Boolean
-      ' Verifico se del tipo giusto
+   ' Funzione che analizza l'hook e se valido ne prestituisce lo posizione(punto)
+   Private Shared Function HookAnalyzer(nCurrHookId As Integer, nFixtHookType As Integer, nFixtHookClass As Integer, ptFixtHook As Point3d, ByRef ptCurrHook As Point3d) As Boolean
+      ' verifico se del tipo giusto
      Dim nTableHookType As GDB_TY = EgtGetType(nCurrHookId)
-      If Not (nTableHookType = GDB_TY.GEO_POINT And nFixtHookType = DispositionUtility.HOOKTYPE.POINT) AndAlso
-         Not (nTableHookType = GDB_TY.CRV_LINE And nFixtHookType = DispositionUtility.HOOKTYPE.LINE) Then
-         Return False
-      End If
-
-      ' Verifico se della stessa classe
-      Dim nTableHookClass As Integer = DispositionUtility.GetHookClass( nCurrHookId)
-      If nTableHookClass <> nFixtHookClass Then
-         Return False
-      End If
-
-      Dim dDist As Double = 0
-      ' punto a distanza minima sull'hook
-      If nTableHookType = GDB_TY.GEO_POINT Then
-         ' verifico se utilizzato
-         If Not DispositionUtility.GetIsHookUsed( nCurrHookId) Then
-            ' calcolo distanza punto hook tavola dal punto hook della ventosa
-            EgtStartPoint(nCurrHookId, GDB_ID.ROOT, ptCurrHook)
-            Return True
+      If (nTableHookType = GDB_TY.GEO_POINT And nFixtHookType = DispositionUtility.HOOKTYPE.POINT) OrElse (nTableHookType = GDB_TY.CRV_LINE And nFixtHookType = DispositionUtility.HOOKTYPE.LINE) Then
+         ' verifico se della stessa classe
+         Dim nTableHookClass As Integer = 0
+         EgtGetInfo(nCurrHookId, DispositionUtility.CLASS_, nTableHookClass)
+         If nTableHookClass = nFixtHookClass Then
+            Dim dDist As Double = 0
+            ' punto a distanza minima sull'hook
+            If nTableHookType = GDB_TY.GEO_POINT Then
+               ' verifico se utilizzato
+               Dim nTableHookUsed As Boolean = False
+               If Not EgtGetInfo(nCurrHookId, DispositionUtility.USED, nTableHookUsed) Then
+                  ' calcolo distanza punto hook tavola dal punto hook della ventosa
+                  EgtStartPoint(nCurrHookId, GDB_ID.ROOT, ptCurrHook)
+                  Return True
+               End If
+            ElseIf nTableHookType = GDB_TY.CRV_LINE Then
+               ' calcolo distanza linea hook tavola dal punto hook della ventosa
+               Dim nRefId As Integer = 0
+               Dim dU As Double = 0
+               EgtPointCurveDist(ptFixtHook, nCurrHookId, nRefId, dDist, dU)
+               EgtAtParamPoint(nCurrHookId, dU, GDB_ID.ROOT, ptCurrHook)
+               Return True
+            End If
         End If
-      ElseIf nTableHookType = GDB_TY.CRV_LINE Then
-         ' calcolo distanza linea hook tavola dal punto hook della ventosa
-         Dim ptL1 As Point3d : EgtStartPoint( nCurrHookId, GDB_ID.ROOT, ptL1)
-         Dim ptL2 As Point3d : EgtEndPoint( nCurrHookId, GDB_ID.ROOT, ptL2)
-         ptCurrHook = DispositionUtility.DistPointSegment( ptFixtHook, ptL1, ptL2)
-         Return True
      End If
      Return False
   End Function
@@ -449,7 +396,6 @@ Public Class FixtureParametersVM
         Dim NextSelectedId As Integer = EgtGetNextSelectedObj()
         If EgtVerifyFixture(SelectedFixtureId) Then
            EgtRemoveFixture(SelectedFixtureId)
-            DispositionUtility.RemoveFixtureFromHook( SelectedFixtureId)
            For Index = 0 To FixtureTypeList.Count - 1
               Dim SelFixtureName As String = String.Empty
               EgtGetName(SelectedFixtureId, SelFixtureName)
@@ -109,34 +109,6 @@
                                   Visibility="{Binding SysNotes_Visibility}"
                                   IsReadOnly="True"/>
         </UniformGrid>
-         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                 ParamChBx="{Binding Path=Invert,
-                                                     UpdateSourceTrigger=PropertyChanged,
-                                                     ValidatesOnDataErrors=True}" 
-                                 Style="{DynamicResource CheckParamV_Margin}"/>
-         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                 ParamCmBxList="{Binding Path=WorkSideList,
-                                                         UpdateSourceTrigger=PropertyChanged,
-                                                         ValidatesOnDataErrors=True}"
-                                 ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
-                                 Style="{DynamicResource ComboParamV_Margin}"/>
-         <UniformGrid Columns="2">
-            <TextBlock Text="{Binding UserNotesTxBl}" 
-                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-               <EgtWPFLib5:EgtTextBox.ToolTip>
-                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-               </EgtWPFLib5:EgtTextBox.ToolTip>
-            </EgtWPFLib5:EgtTextBox>
-            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                       Visibility="{Binding SysNotes_Visibility}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                                   Visibility="{Binding SysNotes_Visibility}"
-                                   IsReadOnly="True"/>
-         </UniformGrid>
      </StackPanel>
      <StackPanel Name="AutomaticCloseExpanderStackPanel">
         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
@@ -264,7 +236,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -294,43 +266,6 @@
            </Grid>
         </Expander>

-         <Expander Style="{StaticResource ExpanderStyle}">
-            <Expander.Header>
-               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                       Style="{DynamicResource ComboParamV_Margin}"/>
-            </Expander.Header>
-            <StackPanel>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                                        ParamTxBx="{Binding Path=StartAddLen,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                                        ParamTxBx="{Binding Path=LiTang,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                                        ParamTxBx="{Binding Path=LiPerp,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}" 
-                                        ParamTxBx="{Binding Path=LiElev,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiCompLenTxBl}" 
-                                        ParamTxBx="{Binding Path=LiCompLen,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-            </StackPanel>
-         </Expander>
         <Expander Style="{StaticResource ExpanderStyle}">
            <Expander.Header>
               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
@@ -369,43 +304,6 @@
            </StackPanel>
         </Expander>

-         <Expander Style="{StaticResource ExpanderStyle}">
-            <Expander.Header>
-               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                                       Style="{DynamicResource ComboParamV_Margin}"/>
-            </Expander.Header>
-            <StackPanel>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                                        ParamTxBx="{Binding Path=EndAddLen,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                                        ParamTxBx="{Binding Path=LoTang,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                                        ParamTxBx="{Binding Path=LoPerp,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoElevTxBl}" 
-                                        ParamTxBx="{Binding Path=LoElev,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoCompLenTxBl}" 
-                                        ParamTxBx="{Binding Path=LoCompLen,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-            </StackPanel>
-         </Expander>
         <Expander Style="{StaticResource ExpanderStyle}">
            <Expander.Header>
               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
@@ -444,53 +342,6 @@
            </StackPanel>
         </Expander>

-         <Expander Style="{StaticResource ExpanderStyle}">
-            <Expander.Header>
-               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding LeaveTabTxBl}" 
-                                       ParamChBx="{Binding Path=LeaveTab,
-                                                           UpdateSourceTrigger=PropertyChanged,
-                                                           ValidatesOnDataErrors=True}" 
-                                       Style="{DynamicResource CheckParamV_Margin}"/>
-            </Expander.Header>
-            <StackPanel Margin="2">
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabLenTxBl}" 
-                                        ParamTxBx="{Binding Path=TabLen,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        ParamErrorMsg="{Binding Path=TabLenErrorMsg}"
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabHeightTxBl}" 
-                                        ParamTxBx="{Binding Path=TabHeight,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        ParamErrorMsg="{Binding Path=TabHeightErrorMsg}"
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabAngleTxBl}" 
-                                        ParamTxBx="{Binding Path=TabAngle,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}" 
-                                        ParamErrorMsg="{Binding Path=TabAngleErrorMsg}"
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabDistTxBl}" 
-                                        ParamTxBx="{Binding Path=TabDist,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}"
-                                        ParamErrorMsg="{Binding Path=TabDistErrorMsg}"
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMinTxBl}" 
-                                        ParamTxBx="{Binding Path=TabMin,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}"
-                                        ParamErrorMsg="{Binding Path=TabMinErrorMsg}"
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMaxTxBl}" 
-                                        ParamTxBx="{Binding Path=TabMax,
-                                                            UpdateSourceTrigger=PropertyChanged,
-                                                            ValidatesOnDataErrors=True}"
-                                        ParamErrorMsg="{Binding Path=TabMaxErrorMsg}"
-                                        Style="{DynamicResource StringParamV_Margin}"/>
-            </StackPanel>
-         </Expander>
         <Expander Style="{StaticResource ExpanderStyle}">
            <Expander.Header>
               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding LeaveTabTxBl}" 
@@ -571,7 +422,7 @@
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-      
+
         <Interactivity:Interaction.Behaviors>
            <EgtCAM5:AutomaticCloseExpander/>
         </Interactivity:Interaction.Behaviors>
@@ -224,7 +224,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -80,16 +80,4 @@ Public Class FiveAxisMachinigParameterExpanderV
      Return TryCast(target, T)
   End Function

-   Private Sub StackPanel_PreviewKeyDown(sender As Object, e As KeyEventArgs)
-      If e.Key = Key.Tab Then
-         Dim s As EgtWPFLib5.StringParamV = TryCast(e.OriginalSource, EgtWPFLib5.StringParamV)
-
-         If Not IsNothing(s) Then
-            s.MoveFocus(New TraversalRequest(FocusNavigationDirection.Next))
-         End If
-
-         e.Handled = True
-      End If
-
-   End Sub
 End Class
@@ -214,7 +214,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -232,7 +232,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -129,13 +129,13 @@
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                                        ParamTxBx="{Binding Path=OffSl,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
+                                        ParamTxBx="{Binding Path=OffSr,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                                        ParamTxBx="{Binding Path=OffSr,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
+                                        ParamTxBx="{Binding Path=OffSl,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
@@ -241,7 +241,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -213,7 +213,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -217,7 +217,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -211,7 +211,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -209,7 +209,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -217,7 +217,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -124,12 +124,6 @@
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadLinkTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=LeadLinkTypeList,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
-                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
                                        ParamTxBx="{Binding Path=SideAngle,
                                                            UpdateSourceTrigger=PropertyChanged,
@@ -230,7 +224,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -199,7 +199,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -218,7 +218,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -236,7 +236,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -226,7 +226,7 @@
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
@@ -329,11 +329,10 @@ Public Class OperationsListExpanderVM
      ' Aggiungo la nuova fase
      Dim nPhase As Integer = EgtAddPhase()
      Dim nDispId As Integer = EgtGetPhaseDisposition(nPhase)
-      ' Confermo grezzi, movimenti assi di disposizione e bloccaggi sopra salvati
+      ' Confermo grezzi e bloccaggi sopra salvati
      For Each nId As Integer In vRawId
         EgtKeepRawPart(nId, nLastPhase)
      Next
-      EgtKeepAllDispAxes( nLastPhase)
      For Each nId As Integer In vFxtId
         EgtKeepFixture(nId, nLastPhase)
      Next
@@ -434,10 +433,8 @@ Public Class OperationsListExpanderVM

      If EgtGetOperationMode(selOperation.Id) Then
         Map.refOperationParametersExpanderVM.ParametersIsExpanded = True
-         If EgtGetOperationType(selOperation.Id) <> MCH_OY.DISP Then
-            Map.refMachiningParameterExpanderVM.SetSliderScale( EgtGetPreviewMachiningToolStepCount())
-            Map.refMachiningParameterExpanderVM.ResetSliderValue()
-         End If
+         Map.refMachiningParameterExpanderVM.SetSliderScale( EgtGetPreviewMachiningToolStepCount())
+         Map.refMachiningParameterExpanderVM.ResetSliderValue()
      End If
   End Sub

@@ -1,9 +1,9 @@
 <UserControl x:Class="MachiningOptionPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">

-   <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+   <StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
      <!--ContentPresenter that contains the OperationsListExpander-->
      <ContentPresenter Content="{Binding OperationsListExpander,Mode=OneWay}"/>
      <!--ContentPresenter that contains the OperationParametersExpander-->
@@ -1,6 +1,6 @@
 <EgtFloating:EgtFloatingPanel x:Class="OptionPanelV"
                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                              TitleBarOrientation="Vertical"
                              Visibility="{Binding Panel_Visibility}">
@@ -16,7 +16,7 @@
         <Setter Property="DockPanel.Dock" Value="{Binding}" />
      </Style>
   </ItemsControl.ItemContainerStyle>
-
+   
   <interactivity:Interaction.Triggers>
      <interactivity:EventTrigger EventName="Loaded">
         <interactivity:InvokeCommandAction Command="{Binding LoadedCommand}"/>
@@ -4,7 +4,7 @@ Imports System.IO
 Imports System.Globalization
 Imports EgtUILib
 Imports EgtWPFLib5
-Imports EgtWPFLib5.EgtFloating
+Imports System.Windows.Forms.AxHost

 Public Class ProjectVM
   Inherits TabViewModel
@@ -58,28 +58,16 @@ Public Class ProjectVM
      End Get
   End Property

-   Private m_DynamicGrid As New Grid()
-   Public ReadOnly Property DynamicGrid As Grid
-      Get
-         Return m_DynamicGrid
-      End Get
-   End Property

-   Private m_DynamicGridList As New List(Of Object)
-   Public ReadOnly Property DynamicGridList As List(Of Object)
-      Get
-         Return m_DynamicGridList
-      End Get
-   End Property

 #End Region
-
 #Region "EGTUILIB FIELDS"

   Private m_bCPlaneTypePos As Boolean

   ' Variabile per implementazione eventi
   Private m_InputText As String
+   Friend bSelObjOnScene As Boolean = False

 #End Region

@@ -93,17 +81,6 @@ Public Class ProjectVM
      TMDbParamVisibility.bFirst = True
      ' Inizializza i parametri della scena
      'InitializeEgtProject()
-
-      Dim m_TopTrayV As New TopTrayV
-      Dim m_LeftTrayV As New LeftTrayV
-      Dim m_RightTrayV As New RightTrayV
-      Dim m_BottomTrayV As New BottomTrayV
-      Dim m_SceneContentControlV As New SceneContentControlV
-
-      CreateDynamicGrid()
-
-      Dim gridSplitter As GridSplitter = CreateGridSplitter()
-
      ' aggiungo componenti interfaccia
      Dim bPlugin As Boolean = False
      Dim PluginDirNameList() As String = {}
@@ -130,57 +107,30 @@ Public Class ProjectVM
               Dim ConfigurationData As IPluginConfigData = Map.refMainWindowVM.GetConfigData(Of IPluginConfigData)(PluginName & ".ConfigurationData")
               If Not IsNothing(ConfigurationData) And ConfigurationData.ControlList.Count > 0 Then
                  For Each Element In ConfigurationData.ControlList
-                     PopolateGridWithPlugIn(m_TopTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
                     Select Case Element.Name
                        Case PLUGIN_RIGHT_TRAY
-                           'm_PanelList.Add(New RightTrayV)
-                           'aggiungo RightTrayV alla griglia
-                           m_DynamicGrid.Children.Add(m_RightTrayV)
+                           m_PanelList.Add(New RightTrayV)
                           Map.refOptionPanelVM.SetPanelViewState(Element.ViewPanelState)
                        Case PLUGIN_LEFT_TRAY
-                           'm_PanelList.Add(New LeftTrayV)
-                           ' aggiungo LeftTrayV alla griglia
-                           m_DynamicGrid.Children.Add(m_LeftTrayV)
+                           m_PanelList.Add(New LeftTrayV)
                        Case Else
                           m_PanelList.Add(Map.refMainWindowVM.GetControlByName(Of IPluginControl)(Element))
-                           ' aggiungo LeftTrayV alla griglia
-                           'm_DynamicGrid.Children.Add(Map.refMainWindowVM.GetControlByName(Of IPluginControl)(Element))
                     End Select
                  Next
               End If
            End If
         Next
-         ' aggiungo gridSplitter alla griglia
-         m_DynamicGrid.Children.Add(gridSplitter)
-         'm_PanelList.Add(New BottomTrayV)
-         ' aggiungo BottomTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_BottomTrayV)
-         'm_PanelList.Add(New TopTrayV)
-         ' aggiungo TopTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_TopTrayV)
+         m_PanelList.Add(New BottomTrayV)
+         m_PanelList.Add(New TopTrayV)
         ' nascondo tasti gestione progetto se attivo plugin
         Map.refTopCommandBarVM.SetProjectManagerVisibility(False)
      Else
-         PololateGrid(m_TopTrayV, m_LeftTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
-         'm_PanelList.Add(New TopTrayV)
-         'm_PanelList.Add(New LeftTrayV)
-         'm_PanelList.Add(New RightTrayV)
-         'm_PanelList.Add(New BottomTrayV)
-         ' aggiungo TopTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_TopTrayV)
-         ' aggiungo LeftTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_LeftTrayV)
-         ' aggiungo gridSplitter alla griglia
-         m_DynamicGrid.Children.Add(gridSplitter)
-         ' aggiungo RightTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_RightTrayV)
-         ' aggiungo BottomTrayV alla griglia
-         m_DynamicGrid.Children.Add(m_BottomTrayV)
+         m_PanelList.Add(New TopTrayV)
+         m_PanelList.Add(New LeftTrayV)
+         m_PanelList.Add(New RightTrayV)
+         m_PanelList.Add(New BottomTrayV)
      End If
-      'm_PanelList.Add(New SceneContentControlV)
-      ' aggiungo SceneContentControlV alla griglia
-      m_DynamicGrid.Children.Add(m_SceneContentControlV)
-      m_PanelList.Add(m_DynamicGrid)
+      m_PanelList.Add(New SceneContentControlV)
   End Sub

 #End Region
@@ -344,125 +294,6 @@ Public Class ProjectVM

 #Region "METHODS"

-   ''' <summary>
-   ''' Funzione per popolare la griglia
-   ''' </summary>
-   ''' <param name="m_TopTrayV"></param>
-   ''' <param name="m_LeftTrayV"></param>
-   ''' <param name="m_RightTrayV"></param>
-   ''' <param name="m_BottomTrayV"></param>
-   ''' <param name="m_SceneContentControlV"></param>
-   ''' <param name="gridSplitter"></param>
-   Private Shared Sub PololateGrid(m_TopTrayV As TopTrayV, m_LeftTrayV As LeftTrayV, m_RightTrayV As RightTrayV, m_BottomTrayV As BottomTrayV, m_SceneContentControlV As SceneContentControlV, gridSplitter As GridSplitter)
-      ' aggiungo TopTrayV
-      Grid.SetRow(m_TopTrayV, 0)
-      Grid.SetColumnSpan(m_TopTrayV, 3)
-
-      ' aggiungo LeftTrayV
-      Grid.SetRow(m_LeftTrayV, 1)
-      Grid.SetColumn(m_LeftTrayV, 0)
-      Grid.SetRowSpan(m_LeftTrayV, 2)
-
-      ' aggiungo RightTrayV
-      Grid.SetRow(m_RightTrayV, 1)
-      Grid.SetColumn(m_RightTrayV, 2)
-      Grid.SetRowSpan(m_RightTrayV, 2)
-
-      'aggiungo gridSplitter
-      Grid.SetRow(gridSplitter, 1)
-      Grid.SetColumn(gridSplitter, 2)
-
-      ' aggiungo BottomTrayV
-      Grid.SetRow(m_BottomTrayV, 2)
-      Grid.SetColumn(m_BottomTrayV, 1)
-
-      ' aggiungo Scena
-      Grid.SetRow(m_SceneContentControlV, 1)
-      Grid.SetColumn(m_SceneContentControlV, 1)
-   End Sub
-
-   ''' <summary>
-   ''' Funzione per popolare la griglia con PlugIn
-   ''' </summary>
-   ''' <param name="m_TopTrayV"></param>
-   ''' <param name="m_RightTrayV"></param>
-   ''' <param name="m_BottomTrayV"></param>
-   ''' <param name="m_SceneContentControlV"></param>
-   ''' <param name="gridSplitter"></param>
-   Private Shared Sub PopolateGridWithPlugIn(m_TopTrayV As TopTrayV, m_RightTrayV As RightTrayV, m_BottomTrayV As BottomTrayV, m_SceneContentControlV As SceneContentControlV, gridSplitter As GridSplitter)
-      ' aggiungo TopTrayV
-      Grid.SetRow(m_TopTrayV, 0)
-      Grid.SetColumn(m_TopTrayV, 1)
-
-      ' aggiungo RightTrayV
-      Grid.SetRow(m_RightTrayV, 0)
-      Grid.SetColumn(m_RightTrayV, 2)
-      Grid.SetRowSpan(m_RightTrayV, 2)
-
-      'aggiungo gridSplitter
-      Grid.SetRow(gridSplitter, 0)
-      Grid.SetColumn(gridSplitter, 2)
-      Grid.SetRowSpan(gridSplitter, 2)
-
-      ' aggiungo BottomTrayV
-      Grid.SetRow(m_BottomTrayV, 2)
-      Grid.SetColumn(m_BottomTrayV, 1)
-
-      ' aggiungo Scena
-      Grid.SetRow(m_SceneContentControlV, 1)
-      Grid.SetColumn(m_SceneContentControlV, 1)
-   End Sub
-
-   ''' <summary>
-   ''' Creazione GridSplitter
-   ''' </summary>
-   ''' <returns></returns>
-   Private Shared Function CreateGridSplitter() As GridSplitter
-      ' creo gridsplitter
-      Return New GridSplitter With {
-         .Width = 30,
-         .HorizontalAlignment = HorizontalAlignment.Left,
-         .VerticalAlignment = VerticalAlignment.Stretch,
-         .Background = Brushes.Transparent
-      }
-   End Function
-
-   ''' <summary>
-   ''' Creazione Griglia Dinamica
-   ''' </summary>
-   Private Sub CreateDynamicGrid()
-      ' creo colonne griglia dinamica
-      Dim gridCol1 As New ColumnDefinition With {
-         .Width = New GridLength(1, GridUnitType.Auto)
-      }
-      '.Width = New GridLength(1, GridUnitType.Auto)
-      Dim gridCol2 As New ColumnDefinition With {
-         .Width = New GridLength(1, GridUnitType.Star)
-      }
-      Dim gridCol3 As New ColumnDefinition With {
-         .Width = New GridLength(250)
-      }
-      ' aggiungo le colonne alla griglia
-      m_DynamicGrid.ColumnDefinitions.Add(gridCol1)
-      m_DynamicGrid.ColumnDefinitions.Add(gridCol2)
-      m_DynamicGrid.ColumnDefinitions.Add(gridCol3)
-
-      ' creo righe griglia dinamica
-      Dim gridRow1 As New RowDefinition With {
-         .Height = New GridLength(1, GridUnitType.Auto)
-      }
-      Dim gridRow2 As New RowDefinition With {
-         .Height = New GridLength(1, GridUnitType.Star)
-      }
-      Dim gridRow3 As New RowDefinition With {
-         .Height = New GridLength(1, GridUnitType.Auto)
-      }
-      ' aggiungo righe alla griglia
-      m_DynamicGrid.RowDefinitions.Add(gridRow1)
-      m_DynamicGrid.RowDefinitions.Add(gridRow2)
-      m_DynamicGrid.RowDefinitions.Add(gridRow3)
-   End Sub
-
   Private Sub PreInitializeScene()
      ' imposto colore di default
      Dim DefColor As New Color3d(0, 0, 0)
@@ -1273,8 +1104,8 @@ Public Class ProjectVM
         Select Case m_SceneSelType
            Case SceneSelTypeOpt.FIXTURE
               Dim nFixtureId As Integer = EgtGetParent(EgtGetParent(nId))
-               'Dim sName As String = ""
-               'EgtGetName(EgtGetParent(nId), sName)
+               Dim sName As String = ""
+               EgtGetName(EgtGetParent(nId), sName)
               If EgtVerifyFixture(nFixtureId) Then
                  m_SelType = DispositionUtility.SelType.FIXTURE
                  ' Se già selezionato 
@@ -1292,12 +1123,14 @@ Public Class ProjectVM
                  EgtGetPlaneSnapPoint(e.Location, Vector3d.Z_AX, TableRef.z, ptCurr)
                  DispositionUtility.VtHookFinder(nFixtureId, ptCurr)
                  Exit While
-               ElseIf DispositionUtility.VerifyTableAxis(nFixtureId) Then
-                  m_SelType = DispositionUtility.SelType.BARS
-                  m_nIdToSel = nFixtureId
-                  ' Drag possibile
-                  m_bDrag = True
-                  Exit While
+               ElseIf sName.Contains(DispositionUtility.MOBILE) Then
+                  Dim sInfo As String = ""
+                  If EgtGetInfo(EgtGetParent(nId), "MDir", sInfo) Then
+                     m_SelType = DispositionUtility.SelType.BARS
+                     m_nIdToSel = EgtGetParent(nId)
+                     ' Drag possibile
+                     m_bDrag = True
+                  End If
               End If
            Case SceneSelTypeOpt.RAWPART, SceneSelTypeOpt.RAWPARTWITHFIXTURE
               Dim nRawPartId As Integer = EgtGetParent(nId)
@@ -1359,6 +1192,7 @@ Public Class ProjectVM
      vtMove.z = 0
      ' Muovo gli oggetti selezionati se consentito
      DispositionUtility.MoveRawPartPartAndFixture(nMoveId, vtMove, m_SelType, ptCurr)
+      'EgtSaveFile("c:\Temp\ProveMovimentoVentose\Prova1.nge", NGE.BIN)
      EgtDraw()
      ' Aggiorno il punto precedente
      m_ptPrev = ptCurr
@@ -1491,6 +1325,25 @@ Public Class ProjectVM
         If Not EgtIsSelectedObj(nId) Then m_Controller.MouseSelectedObj(nId, bLast)
      Else
         m_Controller.MouseSelectedObj(nId, bLast)
+         ' Recupero primo layer selezionato
+         Dim nFirstSelId As Integer = EgtGetFirstSelectedObj()
+         ' Se viene selezionato un layer diverso deseleziono il layer precedente
+         If nFirstSelId <> nId Then
+            SetLastInteger(nFirstSelId)
+            Map.refProjectVM.ExecuteCommand(Controller.CMD.DESELECTPARTLAYEROBJ)
+         End If
+         ' Selezione layer in albero
+         bSelObjOnScene = True
+         Map.refManageLayerExpanderVM.UpdateObjInObjTree(nId)
+         Map.refManageLayerExpanderVM.SelectIdInObjTree(nId)
+         Map.refManageLayerExpanderVM.UpdateObjTree()
+         Map.refProjectVM.ExecuteCommand(Controller.CMD.SETCURRPARTLAYER)
+
+         ' Cancello geometria e info di eventuale precedente analisi
+         Analyze.ClearAnalyzeGroup()
+         Map.refStatusBarVM.NotifyStatusOutput("")
+         EgtDraw()
+         bSelObjOnScene = False
      End If
   End Sub

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

 Public Class PrepareInputBoxParam
   Friend sTitle As String
@@ -62,4 +64,112 @@ Public Class NewMachOpParam
      Me.SelMachOpId = SelMachOpId
   End Sub

+End Class
+
+Public Class InfoItem
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend nId As Integer
+   ''' <summary>
+   ''' Indice lista info note
+   ''' </summary>
+   Public ReadOnly Property Id As Integer
+      Get
+         Return Id
+      End Get
+   End Property
+
+   Friend sKey As String
+   ''' <summary>
+   ''' Chiave lista info note
+   ''' </summary>
+   Public ReadOnly Property Key As String
+      Get
+         Return sKey
+      End Get
+   End Property
+
+   Friend sValour As String
+   ''' <summary>
+   ''' Valore lista info note
+   ''' </summary>
+   Public Property Valour As String
+      Get
+         Return sValour
+      End Get
+      Set(value As String)
+         sValour = value
+         NotifyPropertyChanged(NameOf(Valour))
+      End Set
+   End Property
+
+#End Region    ' Fields & Properties
+
+   ' Comandi
+   Private m_cmdRemoveInfoItem As ICommand
+   Private m_cmdDoneInfo As ICommand
+
+#Region "CONSTRUCTORS"
+
+   Sub New(nId As Integer, sKey As String, sValue As String)
+      Me.nId = nId
+      Me.sKey = sKey
+      Me.sValour = sValue
+   End Sub
+
+#End Region    ' Constructors
+
+#Region "COMMANDS"
+
+#Region "RemoveItemNoteCommand"
+
+   ''' <summary>
+   ''' Comando per rimuovere l'informazione selezionata dalla combobox
+   ''' </summary>
+   Public ReadOnly Property RemoveInfoItemCommand As ICommand
+      Get
+         If m_cmdRemoveInfoItem Is Nothing Then
+            m_cmdRemoveInfoItem = New Command(AddressOf RemoveInfoItem)
+         End If
+         Return m_cmdRemoveInfoItem
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Rimuove l'informazione selezionata dalla combobox
+   ''' </summary>
+   ''' <param name="param"></param>
+   Public Sub RemoveInfoItem(ByVal param As Object)
+      Map.refInputExpanderVM.RemoveItemInfo(Me)
+   End Sub
+
+#End Region    ' RemoveItemNoteCommand
+
+#Region "DoneInfoCommand"
+
+   ''' <summary>
+   ''' Comando per la conferma modifica o aggiunta nuova informazione
+   ''' </summary>
+   Public ReadOnly Property DoneInfoCommand As ICommand
+      Get
+         If m_cmdDoneInfo Is Nothing Then
+            m_cmdDoneInfo = New Command(AddressOf DoneInfo)
+         End If
+         Return m_cmdDoneInfo
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Conferma modifica o aggiunta nuova informazione
+   ''' </summary>
+   Public Sub DoneInfo(ByVal param As Object)
+      Map.refInputExpanderVM.Done(Me)
+   End Sub
+
+#End Region    ' DoneInfoCommand
+
+#End Region    ' Commands
+
 End Class
@@ -220,7 +220,7 @@ Public Class TopCommandBarVM
         ' Cerco di preimpostare come corrente la macchina opportuna
         If Not bAllowEmpty AndAlso EgtGetSelectedObjCount() = 0 AndAlso EgtGetMachGroupCount() > 0 Then
            Dim sMachineName As String = ""
-            if EgtGetMachGroupMachineName( EgtGetFirstMachGroup(), sMachineName) Then
+            if EgtGetMachGroupMachineName( EgtGetLastMachGroup(), sMachineName) Then
               Map.refMachinePanelVM.SelectedMachine = Map.refMachinePanelVM.MachinesList.FirstOrDefault(Function(x) x.Name = sMachineName)
            End If
         End If
@@ -241,7 +241,7 @@ Public Class TopCommandBarVM
            If Not IsNothing(Map.refDoorPanelVM) Then Map.refDoorPanelVM.MTableIsEnabled(bIsEnabled)
            If Not IsNothing(Map.refSpecialPanelVM) Then Map.refSpecialPanelVM.SpecialPanelIsEnabled(bIsEnabled)
         End If
-      Else
+            Else
         ' Deseleziono tutto
         EgtDeselectAll()
         ' Pulisco lista e geometria faccette di superfici di lavorazione corrente
@@ -38,7 +38,6 @@
   <EgtCAM5:DoorPanelVM x:Key="DoorsPanelViewModel"/>
   <EgtCAM5:GunStockPanelVM x:Key="GunStockPanelViewModel"/>
   <EgtCAM5:MyMachGroupPanelVM x:Key="MachGroupPanelViewModel"/>
-   <EgtCAM5:WinFormPluginControlVM x:Key="WinFormPluginControlViewModel"/>
   <!--<EgtCAM5:MachGroupPanelVM x:Key="MachGroupPanelViewModel"/>-->
   <!--<EgtCAM5:OperationExpanderVM x:Key="OperationExpanderViewModel"/>-->

@@ -459,10 +458,6 @@
   <Style x:Key="DrawPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
      <Setter Property="Height" Value="30"/>
      <Setter Property="Width" Value="30"/>
-      <Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
-      <Setter Property="ContextMenuService.Placement" Value="Right"/>
-      <Setter Property="ContextMenuService.HorizontalOffset" Value="-1.5"/>
-      <Setter Property="ContextMenuService.VerticalOffset" Value="-3.5"/>
   </Style>

   <Style x:Key="MachiningsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -1228,9 +1223,9 @@
      <Setter Property="Margin" Value="1,0,0,0"/>
   </Style>

-    <Style x:Key="MPExpander_UserNotesTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
-        <Setter Property="Margin" Value="-1,0,0,0"/>
-    </Style>
+   <Style x:Key="MPExpander_UserNotesTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
+      <Setter Property="Margin" Value="-1,0,0,0"/>
+   </Style>

   <!-- ______________________________________________________________________________________________________________________________________________ -->

@@ -1263,26 +1258,6 @@
      </Style.Triggers>
   </Style>

-<Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="ListBoxItem">
-               <Border Name="_Border"
-                       SnapsToDevicePixels="True"
-                       BorderBrush="{StaticResource EgaltechWhite}"
-                       BorderThickness="1">
-                  <ContentPresenter />
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsSelected" Value="True">
-                     <Setter TargetName="_Border" Property="Background" Value="{StaticResource Button.Pressed.Background}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   
   <!-- ______________________________________________________________________________________________________________________________________________ -->

   <!-- Style CheckBox -->
@@ -1297,20 +1272,4 @@
      </Style.Triggers>-->
   </Style>

-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-
-   <ItemsPanelTemplate x:Key="MenuItemPanelTemplate">
-      <StackPanel Margin="-38,0,0,0" Background="Transparent" />
-   </ItemsPanelTemplate>
-
-   <Style x:Key="ContextMenu_Button" TargetType="{x:Type ContextMenu}">
-      <Setter Property="ItemsPanel" Value="{StaticResource MenuItemPanelTemplate}"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="Width" Value="37"/>
-   </Style>
-
 </ResourceDictionary>
@@ -1,8 +1,6 @@
 <Grid x:Class="WinFormPluginControlV"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-      xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
      DockPanel.Dock="{Binding DockSide}"
      Height="{Binding Height}"
      Width="{Binding Width}"
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-      <security>
-         <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-            <!-- UAC Manifest Options
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
             If you want to change the Windows User Account Control level replace the 
             requestedExecutionLevel node with one of the following.

@@ -16,49 +16,49 @@
            Remove this element if your application requires this virtualization for backwards
            compatibility.
        -->
-            <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-         </requestedPrivileges>
-      </security>
-   </trustInfo>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>

-   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-      <application>
-         <!-- A list of the Windows versions that this application has been tested on
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
           and is designed to work with. Uncomment the appropriate elements
           and Windows will automatically select the most compatible environment. -->

-         <!-- Windows Vista -->
-         <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />

-         <!-- Windows 7 -->
-         <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />

-         <!-- Windows 8 -->
-         <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />

-         <!-- Windows 8.1 -->
-         <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />

-         <!-- Windows 10 -->
-         <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />

-      </application>
-   </compatibility>
+    </application>
+  </compatibility>

-   <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->

-   <application xmlns="urn:schemas-microsoft-com:asm.v3">
-      <windowsSettings>
-         <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-      </windowsSettings>
-   </application>
-
-
-   <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-   <!--
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
  <dependency>
    <dependentAssembly>
      <assemblyIdentity
Author	SHA1	Message	Date
Demetrio Cassarino	34fa0909ab	-aggiunto pulsante per info già presenti -aggiunto selezione in scena e apertura in albero -sitemato accensione luce	2024-11-20 08:10:50 +01:00
Demetrio Cassarino	a662d1dca2	-aggiunto multi riga su info	2024-10-09 14:42:27 +02:00
Demetrio Cassarino	e5a32f9c21	Merge remote-tracking branch 'origin/master' into feature/cw_ccw	2024-10-01 14:13:55 +02:00