-aggiunto pulsante per info già presenti

-aggiunto selezione in scena e apertura in albero
-sitemato accensione luce

Base/TreeView/TreeViewItemBase.vb

@@ -1,5 +1,7 @@
 Imports System.Collections.ObjectModel
 Imports System.ComponentModel
+Imports EgtUILib
+Imports EgtUILib.EgtInterface
 
 ' Classe che definisce un elemento di base del TreeView
 Public Class TreeViewItemBase
@@ -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

DrawPanel/DrawPanelV.xaml

@@ -14,47 +14,20 @@
             <TextBlock Text="{Binding Draw2DMsg}"/>
          </Expander.Header>
          <UniformGrid Columns="3">
-            <Button x:Name="PuntoBtn" ToolTip="Punto" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}"
-                    Command="{Binding PointBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               ToolTipService.ShowOnDisabled="True"
-               <Image Source="/Resources/DrawPanel/Point+.png" Stretch="Uniform"/>
+               Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
-               <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}"
+            <Button ToolTip="{Binding Line2PToolTip}" Style="{StaticResource DrawPanelButton}"
-                             Command="{Binding PointReferenceCommand}">
-                        <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
-                     </Button>
-                  </ContextMenu>
-               </Button.ContextMenu>
-            </Button>
-            <Button ToolTip="Linea 2 Punti" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding Line2PBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               Command="{Binding Line2PCommand}" 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 ToolTip="{Binding LinePDLToolTip}" Style="{StaticResource DrawPanelButton}"
-               </Button.ContextMenu>
-            </Button>
-            <Button ToolTip="Linea Punto Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding LinePDLBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/LinePDL+.png" Stretch="Uniform"/>
+               <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>
             <Button ToolTip="{Binding ArcCSEToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
@@ -66,19 +39,11 @@
                Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Arc3P.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="Arco " Style="{StaticResource DrawPanelButton}"
+            <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.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>
             <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
@@ -109,57 +74,25 @@
                Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="Quota Lineare" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding LinearDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               Command="{Binding LinearDimensionCommand}" 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 ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
-               </Button.ContextMenu>
-            </Button>
-            <Button ToolTip="Quota Angolare" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding AngularDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               Command="{Binding AngularDimensionCommand}" 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 ToolTip="{Binding DiamRadDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
-               </Button.ContextMenu>
-            </Button>
-            <Button ToolTip="Quota Diametrale" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding DiamDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               Command="{Binding DiamRadDimensionCommand}" 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 ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
-               </Button.ContextMenu>
-            </Button>
-            <Button ToolTip="Testo" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding TextBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Text+.png" Stretch="Uniform"/>
+               <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>
          </UniformGrid>
       </Expander>
@@ -169,19 +102,11 @@
             <TextBlock Text="{Binding Draw3DMsg}"/>
          </Expander.Header>
          <UniformGrid Columns="3">
-            <Button ToolTip="Piano Contornato" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding FloorCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               Command="{Binding PlaneCommand}" 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>
             <Button ToolTip="{Binding ExtrudeToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
@@ -212,32 +137,16 @@
                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}"
+            <Button ToolTip="{Binding SolidSubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding SubtractSurfacesCommand}" IsEnabled="{Binding bSelOk}">
+               Command="{Binding SolidSubtractSurfCommand}" 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 ToolTip="{Binding SolidIntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               </Button.ContextMenu>
-            </Button>
-            <Button ToolTip="Interseca Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding IntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
+               Command="{Binding SolidIntersectSurfCommand}" 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>
             <Button ToolTip="{Binding IntersectSurfSurfToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
@@ -253,19 +162,11 @@
                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}"
+            <Button ToolTip="{Binding ExplodeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ExplodeSurfaceCommand}" IsEnabled="{Binding bSelOk}">
+               Command="{Binding ExplodeSurfCommand}" 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>
             <Button ToolTip="{Binding ExtractSurfFacetToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
@@ -286,19 +187,11 @@
                Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="Muovi Vertice di Superficie" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding StmMoveVertexFacetToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding MoveStmVertexCommand}" IsEnabled="{Binding bSelOk}">
+               Command="{Binding MoveStmVertexFacetCommand}" 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>
          </UniformGrid>
       </Expander>
       <Expander Name="Modify" Style="{StaticResource ExpanderStyle}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">
@@ -311,19 +204,11 @@
                Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="Cambia Layer" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding ChangeLayerToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding ChangeLayerBaseCommand}" IsEnabled="{Binding bSelOk}">
+               Command="{Binding ChangeLayerCommand}" 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>
             <Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ChangeStatusCommand}" IsEnabled="{Binding bSelOk}">
@@ -379,23 +264,11 @@
                Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeCurve.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="Unisci Curve" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding JoinCurveToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding JoinCurveBasCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               Command="{Binding JoinCurveCommand}" 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>
             <Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
@@ -411,70 +284,31 @@
                Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="Arco Capovolto" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding ArcFlipToolTip}" Style="{StaticResource DrawPanelButton}"
-                    Command="{Binding UpsideDownArchCommand}" ToolTipService.ShowOnDisabled="True" IsEnabled="{Binding bSelOk}">
+               ToolTipService.ShowOnDisabled="True"
-               <Image Source="/Resources/DrawPanel/ArcFlip+.png" Stretch="Uniform"/>
+               Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
-               <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>
             <Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
                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}"
+             <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
                 ToolTipService.ShowOnDisabled="True"
-                    Command="{Binding AddPointCommand}" IsEnabled="{Binding bSelOk}">
+                Command="{Binding AddPointCurveCommand}" 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}"
+             <Button ToolTip="{Binding RemovePointCurveToolTip}" 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}">
+                Command="{Binding RemovePointCurveCommand}" 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}"
+            <Button ToolTip="{Binding ApproxCurveToolTip}" 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}">
+               Command="{Binding ApproxCurveCommand}" 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 ModifyArcRadiusToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">

EgtCAM5.vbproj

@@ -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

LeftTray/LeftTrayV.xaml

@@ -5,4 +5,5 @@
       DockPanel.Dock="Left">
    
    <local:DrawPanelV DataContext="{StaticResource DrawPanelViewModel}"/>
+   
 </Grid>

MachGroupPanel/MyMachGroupPanelVM.vb

@@ -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

MainWindow/MainWindowV.xaml

@@ -10,7 +10,6 @@
    MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
    AboutBoxCommand="{Binding AboutBoxCommand}"
    AllowDrop="True" Drop="MainWindow_Drop"
-                            SnapsToDevicePixels="True"
    CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
    <EgtWPFLib5:EgtCustomWindow.TitlePanel>
       <local:TopCommandBarV DataContext="{StaticResource TopCommandBarViewModel}"/>

MainWindow/MainWindowVM.vb

@@ -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
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2609, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2611, 1, IniFile.m_nKeyOptions)
+                            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

My Project/AssemblyInfo.vb

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

OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml

@@ -8,7 +8,7 @@
          <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>

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml

@@ -1,6 +1,8 @@
 <UserControl x:Class="InputExpanderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <Expander Header="{Binding Title}" IsExpanded="{Binding IsExpanded}" IsEnabled="{Binding IsEnabled}"
              Style="{StaticResource ExpanderStyle}">
@@ -16,17 +18,66 @@
          </StackPanel.Style>
          <TextBlock Text="{Binding TextBlock}"
                     Visibility="{Binding TextVisibility}" Margin="5,5,0,5"/>
-         <TextBox Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"
+         <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*"/>

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml.vb

@@ -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

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb

@@ -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

OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb

@@ -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

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml

@@ -21,7 +21,7 @@
             <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">
@@ -51,7 +51,7 @@
                      </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"/>
+                                   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}" />

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb

@@ -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
 

OptionPanel/DrawOptionPanelV.xaml

@@ -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}}}">
+   <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}"/>
-      --><!--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>
       <!--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}"/>
+      <ContentPresenter Content="{Binding InfoExpander}"/>
-      <GridSplitter Grid.Row="1" Height="5" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"/>
       <!--ContentPresenter that contains the InputExpander-->
-      <ContentPresenter Grid.Row="2" Content="{Binding InputExpander}"/>
+      <ContentPresenter Content="{Binding InputExpander}"/>
-   </Grid>
+   </StackPanel>
 
 </UserControl>

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb

@@ -281,7 +281,6 @@ Public Class DispositionParameterExpanderVM
       End Select
       Map.refRawPartOptionVM.SetMoveWithFixture(False)
       Map.refFixtureParametersVM.UpdateFixtureTypeList()
-      DispositionUtility.InitHookData()
    End Sub
 
 #End Region    ' METHODS

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb

@@ -1,16 +1,17 @@
-Imports System.Windows.Forms.AxHost
+Imports EgtUILib
-Imports EgtUILib
-Imports Microsoft.VisualBasic.ApplicationServices
 
 Public NotInheritable Class DispositionUtility
 
+   Friend Const MOBILE As String = "MOBILE"
+   Friend Const MDIR As String = "MDir"
+   Friend Const STROKE As String = "Stroke"
+   Friend Const POS As String = "Val"
    Friend Const PDIST As String = "PDist"
    Friend Const MDIST As String = "MDist"
-   Friend Const PREV As String = "Prev"
+   Friend Const HOOK As String = "HOOK"
-   Friend Const NEXT_ As String = "Next"
-   Friend Const HOOK As String = "HOOK*"
    Friend Const CLASS_ As String = "CLASS"
-   Friend Const FIXED As String = "FIXED*"
+   Friend Const USED As String = "USED"
+   Friend Const FIXED As String = "FIXED"
    Friend Const TYPE As String = "TYPE"
    Friend Const FREE As String = "FREE"
    Friend Const LINE As String = "LINE"
@@ -21,84 +22,9 @@ Public NotInheritable Class DispositionUtility
       LINE = 2
    End Enum
 
-   Private Shared m_vtHook As Vector3d = Vector3d.NULL
+   Friend Shared m_vtHook As Vector3d = Vector3d.NULL
-   Private Shared m_nUsedHookId As Integer = GDB_ID.NULL
+   Friend Shared m_nUsedHookId As Integer = GDB_ID.NULL
-   Private Shared m_nPrevUsedHookId As Integer = GDB_ID.NULL
+   Friend Shared m_nPrevUsedHookId As Integer = GDB_ID.NULL
-   Private Shared m_nPrevFixtureId As Integer = GDB_ID.NULL
-
-   Friend Class HookData
-      Public m_sName As String
-      Public m_sParent As String
-      Public m_bParentAxis As Boolean
-      Public m_sGrParentAxis As String
-      Public m_nId As Integer
-      Public m_nType As HOOKTYPE
-      Public m_ptP1 As Point3d
-      Public m_ptP2 As Point3d
-      Public m_nClass As Integer
-      Public m_nHooked As Integer
-      Public m_sHooked As String
-      Sub New()
-         m_sName = ""
-         m_sParent = ""
-         m_bParentAxis = False
-         m_sGrParentAxis = ""
-         m_nId = GDB_ID.NULL
-         m_nType = HOOKTYPE.FREE
-         m_ptP1 = Point3d.ORIG()
-         m_ptP2 = Point3d.ORIG()
-         m_nClass = 0
-         m_nHooked = GDB_ID.NULL
-         m_sHooked = ""
-      End Sub
-      Sub New(sName As String, sParent As String, bParentAxis As Boolean, sGrParentAxis As String,
-              nId As Integer, ptP As Point3d, nClass As Integer)
-         m_sName = sName
-         m_sParent = sParent
-         m_bParentAxis = bParentAxis
-         m_sGrParentAxis = sGrParentAxis
-         m_nId = nId
-         m_nType = HOOKTYPE.POINT
-         m_ptP1 = ptP
-         m_ptP2 = Point3d.ORIG()
-         m_nClass = nClass
-         m_nHooked = GDB_ID.NULL
-         m_sHooked = ""
-      End Sub
-      Sub New(sName As String, sParent As String, bParentAxis As Boolean, sGrParentAxis As String,
-              nId As Integer, ptP1 As Point3d, ptP2 As Point3d, nClass As Integer)
-         m_sName = sName
-         m_sParent = sParent
-         m_bParentAxis = bParentAxis
-         m_sGrParentAxis = sGrParentAxis
-         m_nId = nId
-         m_nType = HOOKTYPE.LINE
-         m_ptP1 = ptP1
-         m_ptP2 = ptP2
-         m_nClass = nClass
-         m_nHooked = GDB_ID.NULL
-         m_sHooked = ""
-      End Sub
-   End Class
-   Friend Shared m_vHookData As New List(Of HookData)
-
-   Friend Shared Function DistPointSegment( ptP As Point3d, ptS1 As Point3d, ptS2 As Point3d) As Point3d
-      If AreSamePointApprox( ptS1, ptS2) Then
-         Return Point3d.Media( ptS1, ptS2)
-      End If
-      Dim vtDir As Vector3d = ptS2 - ptS1
-      vtDir.z = 0
-      Dim dLen As Double = vtDir.Len()
-      vtDir /= dLen
-      Dim dProSca As Double = vtDir * ( ptP - ptS1)
-      If dProSca < EPS_SMALL Then
-         Return ptS1
-      ElseIf dProSca > dLen - EPS_SMALL Then
-         Return ptS2
-      Else
-         Return ptS1 + dProSca * vtDir
-      End If
-   End Function
 
    ' Identificativi per elemento da selezionare/deselezionare
    Friend Enum SelType As Integer
@@ -182,8 +108,10 @@ Public NotInheritable Class DispositionUtility
             End If
          End While
       Else
+         Dim sName As String = ""
+         EgtGetName(EgtGetParent(nMoveId), sName)
          If EgtVerifyFixture(nMoveId) Then
-            VerifyHookFixture(nMoveId, vtMove, ptCurr, False)
+            VerifyHookFixture(nMoveId, vtMove, ptCurr, True)
             If Not EgtMoveFixture(nMoveId, vtMove) Then
                bErrorMoving = True
             End If
@@ -243,11 +171,11 @@ Public NotInheritable Class DispositionUtility
          Else
             If EgtVerifyFixture(nMoveId) Then
                EgtMoveFixture(nMoveId, -vtMove)
-               ' ripristino occupazione hooks
+               ' segno hook occupato prima del movimento correttivo come non utilizzato
+               SetHookUsed(m_nPrevUsedHookId, nMoveId, True)
+               'EgtSetInfo(m_nPrevUsedHookId, USED, nMoveId)
                SetHookUsed(m_nPrevUsedHookId, nMoveId, False)
-               SetHookUsed(m_nUsedHookId, m_nPrevFixtureId, True)
+               'EgtRemoveInfo(m_nUsedHookId, USED)
-               ' rieseguo verifica nel punto iniziale
-               VerifyHookFixture(nMoveId, Vector3d.NULL(), Point3d.ORIG(), True)
             Else
                EgtMoveRawPart(nMoveId, -vtMove)
             End If
@@ -264,8 +192,6 @@ Public NotInheritable Class DispositionUtility
          Return VerifyFixturePosition(nMovedObjId, vtRefMove)
       ElseIf EgtVerifyRawPartCurrPhase(nMovedObjId) Then
          Return VerifyRawPosition(nMovedObjId, vtOrigMove, vtRefMove)
-      Elseif VerifyTableAxis( nMovedObjId) Then
-         Return True
       Else
          Return False
       End If
@@ -490,10 +416,9 @@ Public NotInheritable Class DispositionUtility
          EgtGetBBoxGlob(nFixtureId, GDB_BB.ONLY_VISIBLE, bboxFixture)
          ' verifico se c'è sovrapposizione
          If bboxRawPartId.OverlapsXY(bboxFixture) Then
-            ' recupero il tipo di fixture         
+            Select Case FixtureType(nFixtureId)
-            Dim nFxtType As FIX_TYPE = FixtureType(nFixtureId)
+               ' se il sottopezzo è una ventosa
-            ' Se è ventosa o morsa
+               Case FIX_TYPE.VACUUM
-            If nFxtType = FIX_TYPE.VACUUM Or nFxtType = FIX_TYPE.VISE Then
                   ' recupero altezza ventosa
                   Dim dFixtureHeight As Double = 0
                   EgtGetInfo(nFixtureId, "H", dFixtureHeight)
@@ -513,19 +438,15 @@ Public NotInheritable Class DispositionUtility
                      dRawPartMin.ToLoc(TableFrame)
                   End If
                   bIsFixtureUnderRawPart = True
-            End If
+                  ' se il sottopezzo è un riferimento
-            ' Se è morsa
+               Case FIX_TYPE.REFERENCE
-            If nFxtType = FIX_TYPE.VISE Then
-               ' regolo la posizione in Z della morsa
-               EgtSetFixtureMobile( nFixtureId, bboxRawPartId.DimZ())
-            End If
-            ' Se è un riferimento o una morsa
-            If nFxtType = FIX_TYPE.REFERENCE Or nFxtType = FIX_TYPE.VISE Then
                   ' recupero arco del riferimento
                   Dim arcRefId As Integer = EgtGetFirstNameInGroup(EgtGetFirstNameInGroup(nFixtureId, SOLID), REF_ARC)
                   ' calcolo bbox dell'arco di riferimento
                   Dim bboxArcRef As New BBox3d
                   EgtGetBBoxGlob(arcRefId, GDB_BB.STANDARD, bboxArcRef)
+                  ' ne faccio l'offset ??
+                  'bboxArcRef.Expand(10)
                   If bboxRawPartId.OverlapsXY(bboxArcRef) Then
                      ' recupero contorno del grezzo
                      Dim ccompoRawPartOutlineId As Integer = EgtGetFirstNameInGroup(nRawId, RAWOUTLINE)
@@ -576,7 +497,7 @@ Public NotInheritable Class DispositionUtility
                      Dim nContactColDisk As Integer = EgtGetFirstNameInGroup(EgtGetFirstNameInGroup(nFixtureId, SOLID), REF_DISK)
                      EgtSetColor(nContactColDisk, ReferenceContactColRed)
                   End If
-            End If
+            End Select
          ' se non c'è sovrapposizione
          ElseIf FixtureType(nFixtureId) = FIX_TYPE.REFERENCE Then
             ' il grezzo non  è in battuta sul riferimento
@@ -602,84 +523,103 @@ Public NotInheritable Class DispositionUtility
       Return True
    End Function
 
-' Funzione che verifica se asse o sottoasse di tavola (e quindi barra o carrello)
-   Friend Shared Function VerifyTableAxis( nObjId As Integer) As Boolean
-      ' Verifico se asse
-      Dim sObjName As String = ""
-      If Not EgtGetName( nObjId, sObjName) OrElse EgtGetAxisId( sObjName) = GDB_ID.NULL Then Return False
-      ' Recupero il padre
-      Dim nParId As Integer = EgtGetParent( nObjId)
-      Dim sParName As String = ""
-      If Not EgtGetName( nParId, sParName) Then Return False
-      ' Verifico se tavola
-      If EgtGetTableId( sParName) <> GDB_ID.NULL Then Return True
-      ' Verifico se asse di tavola
-      Return VerifyTableAxis( nParId)
-   End Function
-
    ' Funzione che verifica i movimenti della barra
    Private Shared Function VerifyBarPosition(nMoveId As Integer, vtMove As Vector3d) As Boolean
-      ' Nome dell'asse
+      ' verifico direzione di spostamento consentita
-      Dim sName As String = ""
+      Dim sMDir As String = ""
-      If Not EgtGetName( nMoveId, sName) Then Return False
+      EgtGetInfo(nMoveId, MDIR, sMDir)
-      ' Recupero la direzione di spostamento
+      Dim aMDir() As String = sMDir.Split(","c)
-      Dim vtDir As New Vector3d
+      Dim vX As Integer = 0
-      If Not EgtGetAxisDir( sName, VtDir) Then Return False
+      Dim vY As Integer = 0
-      ' Recupero la corsa
+      Dim vZ As Integer = 0
-      Dim dAxMin As Double = 0
+      Integer.TryParse(aMDir(0), vX)
-      Dim dAxMax As Double = 0
+      Integer.TryParse(aMDir(1), vY)
-      If Not EgtGetAxisMin( sName, dAxMin) OrElse Not EgtGetAxisMax( sName, dAxMax) Then Return False
+      Integer.TryParse(aMDir(2), vZ)
-      ' Recupero dati barra corrente
+      Dim vtMDir As New Vector3d(vX, vY, vZ)
-      Dim dCurrBarPos As Double = 0
+      vtMDir.Normalize()
-      Dim dCurrBarMEnc As Double = 0
+      vtMove = vtMove * vtMDir * vtMDir
-      Dim dCurrBarPEnc As Double = 0
+      ' recupero corsa
-      GetBarExtreme(nMoveId, dCurrBarPos, dCurrBarMEnc, dCurrBarPEnc)
+      Dim sStroke As String = ""
-      ' Recupero dati eventuale barra precedente
+      Dim sStrokes() As String
-      Dim sPrevBarName As String = ""
+      Dim PStroke As Double = 0
-      If EgtGetInfo( nMoveId, PREV, sPrevBarName) Then
+      Dim MStroke As Double = 0
-         Dim nPrevBarId As Integer = EgtGetAxisId( sPrevBarName)
+      EgtGetInfo(nMoveId, STROKE, sStroke)
-         Dim dPrevBarPos As Double = 0
+      sStrokes = sStroke.Split(","c)
-         Dim dPrevBarMEnc As Double = 0
+      StringToDouble(sStrokes(0), MStroke)
-         Dim dPrevBarPEnc As Double = 0
+      StringToDouble(sStrokes(1), PStroke)
-         If Not GetBarExtreme(nPrevBarId, dPrevBarPos, dPrevBarMEnc, dPrevBarPEnc) Then Return False
+      ' recupero dati barra corrente
-         dAxMin = Math.Max( dAxMin, dPrevBarPos + dPrevBarPEnc + dCurrBarMEnc)
+      Dim dCurrBarYPos As Double = 0
+      Dim dCurrBarMVal As Double = 0
+      Dim dCurrBarPVal As Double = 0
+      GetBarExtreme(nMoveId, dCurrBarYPos, dCurrBarMVal, dCurrBarPVal)
+      ' recupero indice barra da spostare
+      Dim sBarName As String = ""
+      EgtGetName(nMoveId, sBarName)
+      Dim nBarId As Integer = 0
+      sBarName = sBarName.Substring(6, sBarName.Length - 6)
+      Integer.TryParse(sBarName, nBarId)
+      ' recupero dati barra precedente
+      Dim dMinYMove As Double
+      Dim dMaxYMove As Double
+      Dim dPrevBarYPos As Double = 0
+      Dim dPrevBarMVal As Double = 0
+      Dim dPrevBarPVal As Double = 0
+      If nBarId > 1 Then
+         ' recupero eventuale barra precedente
+         Dim nPrevBarId As Integer = EgtGetFirstNameInGroup(EgtGetParent(nMoveId), MOBILE & nBarId - 1)
+         If Not nPrevBarId = GDB_ID.NULL Then
+            GetBarExtreme(nPrevBarId, dPrevBarYPos, dPrevBarMVal, dPrevBarPVal)
+            ' calcolo il massimo tra corsa di spostamento ed ingombro della barra precedente
+            dMinYMove = Math.Max(dPrevBarYPos + dPrevBarPVal + dCurrBarMVal, MStroke)
+         Else
+            dMinYMove = MStroke
          End If
-      ' Recupero dati eventuale barra successiva
+      Else
-      Dim sNextBarName As String = ""
+         dMinYMove = MStroke
-      If EgtGetInfo( nMoveId, NEXT_, sNextBarName) Then
-         Dim nNextBarId As Integer = EgtGetAxisId( sNextBarName)
-         Dim dNextBarPos As Double = 0
-         Dim dNextBarMEnc As Double = 0
-         Dim dNextBarPEnc As Double = 0
-         if Not GetBarExtreme(nNextBarId, dNextBarPos, dNextBarMEnc, dNextBarPEnc) Then Return False
-         dAxMax = Math.Min( dAxMax, dNextBarPos - dNextBarMEnc - dCurrBarPEnc)
       End If
-      ' Limito lo spostamento alle corse ammesse
+      ' recupero eventuale barra successiva
-      If dAxMax < dAxMin Then Return False
+      Dim dNextBarYPos As Double = 0
-      Dim dNewBarPos As Double = dCurrBarPos + vtMove * vtDir
+      Dim dNextBarMVal As Double = 0
-      dNewBarPos = Math.Min( Math.Max( dNewBarPos,dAxMin), dAxMax)
+      Dim dNextBarPVal As Double = 0
-      ' Eseguo lo spostamento
+      Dim nNextBarId As Integer = EgtGetFirstNameInGroup(EgtGetParent(nMoveId), MOBILE & nBarId + 1)
-      EgtMoveDispAxis( sName, dNewBarPos)
+      If Not nNextBarId = GDB_ID.NULL Then
-      Dim vtRealMove As Vector3d = ( dNewBarPos - dCurrBarPos) * vtDir
+         GetBarExtreme(nNextBarId, dNextBarYPos, dNextBarMVal, dNextBarPVal)
-      UpdateFixturesForDispAxisMove( sName, vtRealMove)
+         ' calcolo il minimo tra corsa di spostamento ed ingombro della barra successiva
+         dMaxYMove = Math.Min(dNextBarYPos - dNextBarMVal - dCurrBarPVal, PStroke)
+      Else
+         dMaxYMove = PStroke
+      End If
+      ' sottraggo dagli estremi l'ingombro della barra
+      'dMinYMove += dCurrBarMVal
+      'dMaxYMove -= dCurrBarPVal
+      ' verifico che lo spostamento sia entro le corse
+      If dCurrBarYPos + vtMove.y <= dMinYMove Then
+         vtMove.y = dMinYMove - dCurrBarYPos
+      ElseIf dCurrBarYPos + vtMove.y >= dMaxYMove Then
+         vtMove.y = dMaxYMove - dCurrBarYPos
+      End If
+      EgtMove(nMoveId, vtMove)
+      ' scrivo nuova posizione
+      EgtSetInfo(nMoveId, POS, DoubleToString(dCurrBarYPos + vtMove.y, 4))
       Return True
    End Function
 
-   Private Shared Function GetBarExtreme(nMoveId As Integer, ByRef dPos As Double, ByRef dMEnc As Double, ByRef dPEnc As Double) As Boolean
+   Private Shared Function GetBarExtreme(nMoveId As Integer, ByRef YPos As Double, ByRef PVal As Double, ByRef MVal As Double) As Boolean
-      ' Recupero la posizione
+      ' recupero posizione
-      Dim sName As String = ""
+      EgtGetInfo(nMoveId, POS, YPos)
-      If Not EgtGetName( nMoveId, sName) OrElse Not EgtGetAxisPos( sName, dPos) Then Return False
+      ' recupero ingombro negativo
-      ' Recupero ingombro negativo
+      Dim dMDist As Double = 0
-      dMEnc = 0
+      EgtGetInfo(nMoveId, MDIST, dMDist)
-      EgtGetInfo(nMoveId, MDIST, dMEnc)
       ' recupero ingombro positivo
-      dPEnc = 0
+      Dim dPDist As Double = 0
-      EgtGetInfo(nMoveId, PDIST, dPEnc)
+      EgtGetInfo(nMoveId, PDIST, dPDist)
+      MVal = dMDist
+      PVal = dPDist
       Return True
    End Function
 
    ' Funzione che verifica l'agganciamento dei sottopezzi
-   Private Shared Function VerifyHookFixture(nMoveId As Integer, ByRef vtMove As Vector3d, ptCurr As Point3d, bInPlace As Boolean) As Boolean
+   Friend Shared Function VerifyHookFixture(nMoveId As Integer, ByRef vtMove As Vector3d, ptCurr As Point3d, bTolerance As Boolean) As Boolean
       ' cerco punto hook sulla ventosa
       Dim nFixtSolidId As Integer = EgtGetFirstNameInGroup(nMoveId, SOLID)
       Dim nFixtHookId As Integer = EgtGetFirstNameInGroup(nFixtSolidId, HOOK)
@@ -692,6 +632,7 @@ Public NotInheritable Class DispositionUtility
       ElseIf sType.Equals(LINE) Then
          nFixtHookType = HOOKTYPE.LINE
       Else       'FREE
+         nFixtHookType = HOOKTYPE.FREE
          ' esco perchè non devo cercare alcun punto
          Return True
       End If
@@ -701,392 +642,140 @@ Public NotInheritable Class DispositionUtility
       Dim ptFixtHook As Point3d
       EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
       ' calcolo vtMove nel caso normale
-      If bInPlace Then
+      If Not IsNothing(ptCurr) Then
-         ptCurr = ptFixtHook - m_vtHook
+         vtMove = ptCurr - m_vtHook - ptFixtHook
-      ElseIf Not IsNothing(ptCurr) Then
-         vtMove = ptCurr + m_vtHook - ptFixtHook
-      Else
-         ptCurr = ptFixtHook - m_vtHook + vtMove
       End If
-      ' Variabili per tenere da parte l'entità, la distanza e il punto di hook più vicino alla ventosa
+      ' cerco id tavola
+      Dim sTableName As String = ""
+      EgtGetTableName(sTableName)
+      Dim nTableId As Integer = EgtGetTableId(sTableName)
+      ' cerco hook su tavola macchina
+      Dim nTableSolidId As Integer = EgtGetFirstNameInGroup(nTableId, SOLID)
+      Dim nCurrHookId As Integer = EgtGetFirstNameInGroup(nTableSolidId, HOOK)
+      ' variabili per tenere da parte l'entità, la distanza e il punto di hook più vicino alla ventosa
       Dim nNearestHookId As Integer = GDB_ID.NULL
       Dim dNearestHookDist As Double = 99999999
       Dim ptNearestHook As Point3d = Nothing
-      ' Recupero Id tavola corrente
-      Dim sTableName As String = ""
-      EgtGetTableName(sTableName)
-      Dim nTableId As Integer = EgtGetTableId(sTableName)
-      ' *** Cerco hook su tavola ***
-      Dim nTableSolidId As Integer = EgtGetFirstNameInGroup(nTableId, SOLID)
-      Dim nCurrHookId As Integer = EgtGetFirstNameInGroup(nTableSolidId, HOOK)
       While nCurrHookId <> GDB_ID.NULL
-         HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptCurr + m_vtHook, nMoveId, nNearestHookId, dNearestHookDist, ptNearestHook)
+         'HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, nNearestHookId, dNearestHookDist)
+         HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptCurr + m_vtHook, nNearestHookId, dNearestHookDist, ptNearestHook, nMoveId)
          nCurrHookId = EgtGetNextName(nCurrHookId, HOOK)
       End While
-      ' *** Cerco hook su barre fisse ***
+      ' cerco hook su barra fissa
       Dim nTableFixedId As Integer = EgtGetFirstNameInGroup(nTableId, FIXED)
-      While nTableFixedId <> GDB_ID.NULL
       nCurrHookId = EgtGetFirstNameInGroup(nTableFixedId, HOOK)
       While nCurrHookId <> GDB_ID.NULL
-            HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptCurr + m_vtHook, nMoveId, nNearestHookId, dNearestHookDist, ptNearestHook)
+         'HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, nNearestHookId, dNearestHookDist)
+         HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptCurr + m_vtHook, nNearestHookId, dNearestHookDist, ptNearestHook, nMoveId)
          nCurrHookId = EgtGetNextName(nCurrHookId, HOOK)
       End While
-         nTableFixedId = EgtGetNextName(nTableFixedId, FIXED)
+      ' cerco hook su barre mobili
-      End While
+      Dim nMobileInd As Integer = 1
-      ' *** Cerco hook su barre mobili ***
+      Dim nMobile As Integer = EgtGetFirstNameInGroup(nTableId, MOBILE & nMobileInd)
-      Dim nBarId As Integer = EgtGetFirstGroupInGroup(nTableId)
+      While nMobile <> GDB_ID.NULL
-      While nBarId <> GDB_ID.NULL
+         nCurrHookId = EgtGetFirstNameInGroup(nMobile, HOOK)
-         Dim sBarName As String = ""
-         If EgtGetName( nBarId, sBarName) AndAlso EgtGetAxisId( sBarName) <> GDB_ID.NULL Then
-            nCurrHookId = EgtGetFirstNameInGroup(nBarId, HOOK)
          While nCurrHookId <> GDB_ID.NULL
-               HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptCurr + m_vtHook, nMoveId, nNearestHookId, dNearestHookDist, ptNearestHook)
+            'HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, nNearestHookId, dNearestHookDist)
+            HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptCurr + m_vtHook, nNearestHookId, dNearestHookDist, ptNearestHook, nMoveId)
             nCurrHookId = EgtGetNextName(nCurrHookId, HOOK)
          End While
-            ' Cerco su eventuali carrelli
+         nMobileInd += 1
-            Dim nCharId As Integer = EgtGetFirstGroupInGroup(nBarId)
+         nMobile = EgtGetFirstNameInGroup(nTableId, MOBILE & nMobileInd)
-            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
-                     HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptCurr + m_vtHook, nMoveId, nNearestHookId, dNearestHookDist, ptNearestHook)
-                     nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
       End While
-               End If
+      ' se non ho trovato hook compatibili e liberi esco
-               nCharId = EgtGetNextGroup(nCharId)
-            End While
-         End If
-         nBarId = EgtGetNextGroup(nBarId)
-      End While
-
-      ' Se non ho trovato hook compatibili e liberi esco
       If nNearestHookId = GDB_ID.NULL Then Return False
-
+      ' verifico se la distanza minima è inferiore al raggio dell'area di aggancio
-      ' Verifico se la distanza minima è inferiore al raggio dell'area di aggancio
+      Dim dHookTolerance As Double = EgtUILib.GetPrivateProfileDouble(S_FIXTURES, K_HOOKTOLERANCE, 50, IniFile.m_sCurrMachIniFilePath)
-      Dim dHookTolerance As Double = 1
+      If bTolerance AndAlso dNearestHookDist > dHookTolerance Then Return False
-      If Not bInPlace Then
+      ' sostituisco spostamento mouse con spostamento ad hook
-         dHookTolerance = EgtUILib.GetPrivateProfileDouble(S_FIXTURES, K_HOOKTOLERANCE, 50, IniFile.m_sCurrMachIniFilePath)
-      End If
-      If dNearestHookDist > dHookTolerance Then Return False
-
-      ' Sostituisco spostamento mouse con spostamento ad hook
       vtMove = ptNearestHook - ptFixtHook
       m_nUsedHookId = nNearestHookId
-      ' Segno hook come utilizzato
+      ' segno hook come utilizzato
       SetHookUsed(m_nUsedHookId, nMoveId, True)
+      'EgtSetInfo(m_nUsedHookId, USED, nMoveId)
       Return True
    End Function
 
-   ' Funzioni gestione tabella degli Hook 
+   ' funzione di debug
-   Private Shared Function AddOneHookData( nHookId As Integer, sParent As String, bParentAxis As Boolean) As Boolean
+   Private Shared Sub DebugHookInfo()
-      Dim sHook As String = ""
+      ' salvo in outlog tutte le info sugli hook per poter debuggare
-      EgtGetName( nHookId, sHook)
+      ' cerco id tavola
-      Dim sGrParentAxis As String = ""
-      If bParentAxis Then
-         Dim nIdGrParent As Integer = EgtGetParent( EgtGetParent( nHookId))
-         Dim sParentName As String = ""
-         If EgtGetName( nIdGrParent, sParentName)  AndAlso EgtGetAxisId( sParentName) = nIdGrParent Then
-            sGrParentAxis = sParentName
-         End If
-      End If
-      Dim nClass As Integer = 0
-      EgtGetInfo(nHookId, CLASS_, nClass)
-      Dim nType As Integer = EgtGetType( nHookId)
-      If nType = GDB_TY.GEO_POINT Then
-         Dim ptP As Point3d
-         EgtStartPoint( nHookId, GDB_ID.ROOT, ptP)
-         Dim hdCurr As New HookData( sHook, sParent, bParentAxis, sGrParentAxis, nHookId, ptP, nClass)
-         m_vHookData.Add( hdCurr)
-         Return True
-      Else If nType = GDB_TY.CRV_LINE Then
-         Dim ptP1 As Point3d
-         EgtStartPoint( nHookId, GDB_ID.ROOT, ptP1)
-         Dim ptP2 As Point3d
-         EgtEndPoint( nHookId, GDB_ID.ROOT, ptP2)
-         Dim hdCurr As New HookData( sHook, sParent, bParentAxis, sGrParentAxis, nHookId, ptP1, ptP2, nClass)
-         m_vHookData.Add( hdCurr)
-         Return True
-      End If
-      Return False
-   End Function
-
-   Private Shared Sub PrepareHookData()
-      ' Pulisco lista di Hook
-      m_vHookData.Clear()
-      ' Recupero Id tavola corrente
       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, HOOK)
+      EgtOutLog("TABLE")
       While nCurrHookId <> GDB_ID.NULL
-         AddOneHookData( nCurrHookId, SOLID, False)
+         Dim sUsed As String = ""
+         EgtGetInfo(nCurrHookId, USED, sUsed)
+         EgtOutLog(nCurrHookId & " -> " & sUsed)
          nCurrHookId = EgtGetNextName(nCurrHookId, HOOK)
       End While
-      ' *** Cerco hook su barre fisse ***
+      ' cerco hook su barra fissa
+      EgtOutLog("FIXED")
       Dim nTableFixedId As Integer = EgtGetFirstNameInGroup(nTableId, FIXED)
-      While nTableFixedId <> GDB_ID.NULL
-         Dim sName As String = ""
-         EgtGetName( nTableFixedId, sName)
       nCurrHookId = EgtGetFirstNameInGroup(nTableFixedId, HOOK)
       While nCurrHookId <> GDB_ID.NULL
-            AddOneHookData( nCurrHookId, sName, False)
+         Dim sUsed As String = ""
+         EgtGetInfo(nCurrHookId, USED, sUsed)
+         EgtOutLog(nCurrHookId & " -> " & sUsed)
          nCurrHookId = EgtGetNextName(nCurrHookId, HOOK)
       End While
-         nTableFixedId = EgtGetNextName(nTableFixedId, FIXED)
+      ' cerco hook su barre mobili
-      End While
+      Dim nMobileInd As Integer = 1
-      ' *** Cerco hook su barre mobili ***
+      Dim nMobile As Integer = EgtGetFirstNameInGroup(nTableId, MOBILE & nMobileInd)
-      Dim nBarId As Integer = EgtGetFirstGroupInGroup(nTableId)
+      While nMobile <> GDB_ID.NULL
-      While nBarId <> GDB_ID.NULL
+         EgtOutLog("MOBILE" & nMobile)
-         Dim sBarName As String = ""
+         nCurrHookId = EgtGetFirstNameInGroup(nMobile, HOOK)
-         If EgtGetName( nBarId, sBarName) AndAlso EgtGetAxisId( sBarName) = nBarId Then
-            nCurrHookId = EgtGetFirstNameInGroup(nBarId, HOOK)
          While nCurrHookId <> GDB_ID.NULL
-               AddOneHookData( nCurrHookId, sBarName, True)
+            Dim sUsed As String = ""
+            EgtGetInfo(nCurrHookId, USED, sUsed)
+            EgtOutLog(nCurrHookId & " -> " & sUsed)
             nCurrHookId = EgtGetNextName(nCurrHookId, HOOK)
          End While
-            ' Cerco su eventuali carrelli
+         nMobileInd += 1
-            Dim nCharId As Integer = EgtGetFirstGroupInGroup(nBarId)
+         nMobile = EgtGetFirstNameInGroup(nTableId, MOBILE & nMobileInd)
-            While nCharId <> GDB_ID.NULL
-               Dim sCharName As String = ""
-               If EgtGetName( nCharId, sCharName) AndAlso EgtGetAxisId( sCharName) = nCharId Then 
-                  nCurrHookId = EgtGetFirstNameInGroup(nCharId, DispositionUtility.HOOK)
-                  While nCurrHookId <> GDB_ID.NULL
-                     AddOneHookData( nCurrHookId, sCharName, True)
-                     nCurrHookId = EgtGetNextName(nCurrHookId, HOOK)
-                  End While
-               End If
-               nCharId = EgtGetNextGroup(nCharId)
-            End While
-         End If
-         nBarId = EgtGetNextGroup(nBarId)
       End While
    End Sub
 
-   Private Shared Sub PrepareHookedFixtures()
+   ' funzioni che leggono e settano le ventose agganciate agli hook
-      ' Ciclo su tutte le fixtures in tavola
+   Private Shared Function GetHookUsed(nHookId As Integer, nFixtureId As Integer, nFixtureUsed As Integer) As Boolean
-      Dim nFixtId As Integer = EgtGetFirstFixture()
+      ' cerco punto hook sulla ventosa
-      While nFixtId <> GDB_ID.NULL
+      Dim nFixtSolidId As Integer = EgtGetFirstNameInGroup(nFixtureId, SOLID)
-         Dim nHookId As Integer = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( nFixtId, SOLID), HOOK)
+      Dim nFixtHookId As Integer = EgtGetFirstNameInGroup(nFixtSolidId, HOOK)
-         Dim ptP As Point3d
+      ' leggo tipo e classe
-         If EgtStartPoint( nHookId, GDB_ID.ROOT, ptP) Then
+      Dim nFixtHookType As HOOKTYPE = HOOKTYPE.FREE
-            For Each hkCurr As HookData In m_vHookData
+      Dim sType As String = ""
-               If hkCurr.m_nType = HOOKTYPE.POINT Then
+      EgtGetInfo(nFixtHookId, TYPE, sType)
-                  If Point3d.SqDistXY( ptP, hkCurr.m_ptP1) < 1 Then
+      If sType.Equals(POINT) Then
-                     hkCurr.m_nHooked = nFixtId
+         nFixtHookType = HOOKTYPE.POINT
-                     Exit For
+      ElseIf sType.Equals(LINE) Then
-                  End If
+         nFixtHookType = HOOKTYPE.LINE
-               ElseIf hkCurr.m_nType = HOOKTYPE.LINE Then
+      Else       'FREE
-                  Dim dSqDist As Double = Point3d.SqDistXY( ptP, DistPointSegment( ptP, hkCurr.m_ptP1, hkCurr.m_ptP2))
+         nFixtHookType = HOOKTYPE.FREE
-                  If dSqDist < 1 Then
+         ' esco perchè non devo cercare alcun punto
-                     AddHookUsed( hkCurr.m_nId, nFixtId)
-                     Exit For
-                  End If
-               End If
-            Next
-         End If
-         nFixtId = EgtGetNextFixture( nFixtId)
-      End While
-   End Sub
-
-   Friend Shared Sub InitHookData()
-      ' Carico i dati degli agganci
-      PrepareHookData()
-      ' Determino eventuali fixtures agganciate
-      PrepareHookedFixtures()
-      ' Log di debug
-      If Map.refMainWindowVM.DebugLevel() >= 4 then
-         EgtOutLog( " *** HOOK DATA TABLE ***")
-         Dim sCurrParent As String = ""
-         For Each hkCurr As HookData In m_vHookData
-            If hkCurr.m_sParent <> sCurrParent Then
-               sCurrParent = hkCurr.m_sParent
-               If String.IsNullOrWhiteSpace( hkCurr.m_sGrParentAxis) Then 
-                  EgtOutLog( sCurrParent & If( hkCurr.m_bParentAxis, "  Axis", "  Fixed"))
-               Else
-                  EgtOutLog( sCurrParent & " (" & hkCurr.m_sGrParentAxis & ") Axis")
-               End If
-            End If
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-               EgtOutLog( "  " & hkCurr.m_sName & " (" & hkCurr.m_nId &
-                          ")   Point(" & hkCurr.m_ptP1.ToString() & ") Class=" & hkCurr.m_nClass &
-                          If( hkCurr.m_nHooked = GDB_ID.NULL, " Free", " Fixt " & hkCurr.m_nHooked))
-            Else If hkCurr.m_nType = HOOKTYPE.LINE Then
-               EgtOutLog( "  " & hkCurr.m_sName & " (" & hkCurr.m_nId &
-                          ")   Line(" & hkCurr.m_ptP1.ToString() & "),(" & hkCurr.m_ptP2.ToString() & ") Class=" & hkCurr.m_nClass &
-                          If( String.IsNullOrWhiteSpace( hkCurr.m_sHooked), " Free", " Fixt " & hkCurr.m_sHooked))
-            End If
-         Next
-      End If
-   End Sub
-
-   Friend Shared Function GetHookClass( nHookId As Integer) As Integer
-      For Each hkCurr As HookData In m_vHookData
-         If hkCurr.m_nId = nHookId Then Return hkCurr.m_nClass
-      Next
-      Return -1
-   End Function
-
-   Friend Shared Function GetIsHookUsed( nHookId As Integer) As Boolean
-      For Each hkCurr As HookData In m_vHookData
-         If hkCurr.m_nId = nHookId Then
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-                Return ( hkCurr.m_nHooked <> GDB_ID.NULL)
-            Else
-                Return Not String.IsNullOrWhiteSpace( hkCurr.m_sHooked)
-            End If
-         End If
-      Next
-   Return True
-   End Function
-
-   Friend Shared Function GetHookUsed( nHookId As Integer, nFixtureId As Integer) As Integer
-      For Each hkCurr As HookData In m_vHookData
-         If hkCurr.m_nId = nHookId Then
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-               If hkCurr.m_nHooked = nFixtureId then
-                  Return hkCurr.m_nHooked
-               End If
-            Else
-               Dim sFixtureId As String = nFixtureId.ToString & ";"
-               If hkCurr.m_sHooked.IndexOf( sFixtureId) <> -1 Then
-                  Return nFixtureId
-               End If
-            End If
-            Return GDB_ID.NULL
-         End If
-      Next
-      Return GDB_ID.NULL
-   End Function
-
-   Friend Shared Function SetHookUsed( nHookId As Integer, nFixtureId As Integer) As Boolean
-      ' Rimuovo da eventuale precedente aggancio
-      RemoveFixtureFromHook( nFixtureId)
-      ' Inserisco in nuovo aggancio
-      For Each hkCurr As HookData In m_vHookData
-         If hkCurr.m_nId = nHookId Then
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-               m_nPrevFixtureId = hkCurr.m_nHooked
-               hkCurr.m_nHooked = nFixtureId
-               Return True
-            Else
          Return False
       End If
-         End If
+      Select Case nFixtHookType
-      Next
+         Case HOOKTYPE.POINT
-      Return False
+            Return EgtGetInfo(m_nUsedHookId, USED, nFixtureUsed)
-   End Function
+         Case HOOKTYPE.LINE
-   
+            Dim sInfo As String = String.Empty
-   Friend Shared Function ResetHookUsed( nHookId As Integer) As Boolean
+            EgtGetInfo(m_nUsedHookId, USED, sInfo)
-      For Each hkCurr As HookData In m_vHookData
+            Dim SplitInfo() As String = sInfo.Split(";"c)
-         If hkCurr.m_nId = nHookId Then
+            For Each Info In SplitInfo
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-               hkCurr.m_nHooked = GDB_ID.NULL
-               Return True
-            Else
-               Return False
-            End If
-         End If
-      Next
-      Return False
-   End Function
-   
-   Friend Shared Function AddHookUsed( nHookId As Integer, nFixtureId As Integer) As Boolean
-      ' Rimuovo da eventuale precedente aggancio
-      RemoveFixtureFromHook( nFixtureId)
-      ' Inserisco in nuovo aggancio
-      For Each hkCurr As HookData In m_vHookData
-         If hkCurr.m_nId = nHookId Then
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-               Return False
-            Else
-               ' Verifico non sia già presente
-               Dim SplitInfo() As String = hkCurr.m_sHooked.Split(";"c)
-               For Each sInfo As String In SplitInfo
                Dim nInfo As Integer = GDB_ID.NULL
                Integer.TryParse(sInfo, nInfo)
                If nInfo = nFixtureId Then Return True
             Next
-               ' Lo aggiungo
-               hkCurr.m_sHooked &= nFixtureId.ToString() & ";"
-               Return True
-            End If
-         End If
-      Next
             Return False
+         Case Else
+            Return False
+      End Select
    End Function
 
-   Friend Shared Function RemoveHookUsed( nHookId As Integer, nFixtureId As Integer) As Boolean
-      For Each hkCurr As HookData In m_vHookData
-         If hkCurr.m_nId = nHookId Then
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-               Return False
-            Else
-               ' Se lo trovo, lo tolgo dall'elenco
-               Dim SplitInfo() As String = hkCurr.m_sHooked.Split(";"c)
-               hkCurr.m_sHooked = ""
-               For Each sInfo As String In SplitInfo
-                  Dim nInfo As Integer
-                  If Integer.TryParse(sInfo, nInfo) AndAlso nInfo <> nFixtureId Then
-                     hkCurr.m_sHooked &= sInfo & ";"
-                  End If
-               Next
-               Return True
-            End If
-         End If
-      Next
-      Return False
-   End Function
-
-   Friend Shared Function RemoveFixtureFromHook( nFixtureId As Integer) As Boolean
-      Dim sFixtureId As String = nFixtureId.ToString & ";"
-      For Each hkCurr As HookData In m_vHookData
-         If hkCurr.m_nType = HOOKTYPE.POINT Then
-            If hkCurr.m_nHooked = nFixtureId Then
-               hkCurr.m_nHooked = GDB_ID.NULL
-               Return True
-            End If
-         Else
-            Dim nInd As Integer = hkCurr.m_sHooked.IndexOf( sFixtureId)
-            If nInd <> -1 Then
-               hkCurr.m_sHooked = hkCurr.m_sHooked.Remove( nInd, sFixtureId.Length())
-               Return True
-            End If
-         End If
-      Next
-      Return False
-   End Function
-
-   Private Shared Function UpdateFixturesForDispAxisMove( sName As String, vtMove As Vector3d) As Boolean
-      For Each hkCurr As HookData In m_vHookData
-         If hkCurr.m_sParent = sName OrElse hkCurr.m_sGrParentAxis = sName  Then
-            ' Aggiorno posizione di aggancio
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-               hkCurr.m_ptP1 += vtMove
-            Else              ' HOOKTYPE.LINE
-               hkCurr.m_ptP1 += vtMove
-               hkCurr.m_ptP2 += vtMove
-            End If
-            ' Sposto anche eventuali ventosa/e agganciata/e
-            If hkCurr.m_nType = HOOKTYPE.POINT Then
-               If hkCurr.m_nHooked <> GDB_ID.NULL Then EgtMoveFixture( hkCurr.m_nHooked, vtMove)
-            Else              ' HOOKTYPE.LINE
-               Dim SplitInfo() As String = hkCurr.m_sHooked.Split(";"c)
-               For Each sInfo As String In SplitInfo
-                  Dim nInfo As Integer = GDB_ID.NULL
-                  If Integer.TryParse(sInfo, nInfo) Then
-                     EgtMoveFixture( nInfo, vtMove)
-                  End If
-               Next
-            End If
-         End If
-      Next
-      Return True
-   End Function
-
-   ' Funzioni che leggono e settano le ventose agganciate agli hook
    Private Shared Sub SetHookUsed(nHookId As Integer, nFixtureId As Integer, bUsed As Boolean)
       ' cerco punto hook sulla ventosa
       Dim nFixtSolidId As Integer = EgtGetFirstNameInGroup(nFixtureId, SOLID)
@@ -1107,67 +796,85 @@ Public NotInheritable Class DispositionUtility
       Select Case nFixtHookType
          Case HOOKTYPE.POINT
             If bUsed Then
-               SetHookUsed(nHookId, nFixtureId)
+               EgtSetInfo(m_nUsedHookId, USED, nFixtureId)
             Else
-               ResetHookUsed(nHookId)
+               EgtRemoveInfo(m_nUsedHookId, USED)
             End If
          Case HOOKTYPE.LINE
             If bUsed Then
-               AddHookUsed( nHookId, nFixtureId)
+               Dim sInfo As String = String.Empty
+               EgtGetInfo(m_nUsedHookId, USED, sInfo)
+               Dim SplitInfo() As String = sInfo.Split(";"c)
+               For Each Info In SplitInfo
+                  Dim nInfo As Integer = GDB_ID.NULL
+                  Integer.TryParse(sInfo, nInfo)
+                  If nInfo = nFixtureId Then Return
+               Next
+               sInfo = sInfo & nFixtureId & ";"
+               EgtSetInfo(m_nUsedHookId, USED, sInfo)
             Else
-               RemoveHookUsed( nHookId, nFixtureId)
+               Dim sInfo As String = String.Empty
+               EgtGetInfo(m_nUsedHookId, USED, sInfo)
+               Dim SplitInfo() As String = sInfo.Split(";"c)
+               sInfo = ""
+               For Each Info In SplitInfo
+                  Dim nInfo As Integer = GDB_ID.NULL
+                  Integer.TryParse(sInfo, nInfo)
+                  If nInfo <> nFixtureId Then
+                     sInfo = sInfo & Info & ";"
+                  End If
+               Next
+               EgtSetInfo(m_nUsedHookId, USED, sInfo)
             End If
       End Select
    End Sub
 
    ' Funzione che analizza gli hook
-   Private Shared Sub HookAnalyzer(nCurrHookId As Integer, nFixtHookType As Integer, nFixtHookClass As Integer,
+   Private Shared Sub HookAnalyzer(nCurrHookId As Integer, nFixtHookType As Integer, nFixtHookClass As Integer, ptFixtHook As Point3d, ByRef nNearestHookId As Integer, ByRef dNearestHookDist As Double, ByRef ptNearestHook As Point3d, nMoveId As Integer)
-                                   ptFixtHook As Point3d, nMoveId As Integer,
+      ' verifico se del tipo giusto
-                                   ByRef nNearestHookId As Integer, ByRef dNearestHookDist As Double, ByRef ptNearestHook As Point3d)
-      ' Verifico se del tipo giusto
       Dim nTableHookType As GDB_TY = EgtGetType(nCurrHookId)
-      If Not (nTableHookType = GDB_TY.GEO_POINT And nFixtHookType = HOOKTYPE.POINT) AndAlso
+      If (nTableHookType = GDB_TY.GEO_POINT And nFixtHookType = HOOKTYPE.POINT) OrElse (nTableHookType = GDB_TY.CRV_LINE And nFixtHookType = HOOKTYPE.LINE) Then
-         Not (nTableHookType = GDB_TY.CRV_LINE And nFixtHookType = HOOKTYPE.LINE) Then
+         ' verifico se della stessa classe
-         Return
+         Dim nTableHookClass As Integer = 0
-      End If
+         EgtGetInfo(nCurrHookId, CLASS_, nTableHookClass)
-
+         If nTableHookClass = nFixtHookClass Then
-      ' Verifico se della stessa classe
-      Dim nTableHookClass As Integer = GetHookClass( nCurrHookId)
-      If nTableHookClass <> nFixtHookClass Then
-         Return
-      End If
-
             Dim dDist As Double = 0
             ' punto a distanza minima sull'hook
             Dim ptCurrHook As Point3d
             If nTableHookType = GDB_TY.GEO_POINT Then
                ' verifico se utilizzato
-         Dim nTableHookUsed As Integer = GetHookUsed( nCurrHookId, nMoveId)
+               Dim nTableHookUsed As Integer = GDB_ID.NULL
-         If nTableHookUsed <> GDB_ID.NULL AndAlso nTableHookUsed <> nMoveId Then
+               If EgtGetInfo(nCurrHookId, USED, nTableHookUsed) AndAlso nTableHookUsed <> nMoveId Then Return
-            Return
-         End If
                If nTableHookUsed = nMoveId Then
                   SetHookUsed(nCurrHookId, nMoveId, False)
+                  'EgtRemoveInfo(nCurrHookId, USED)
                   m_nPrevUsedHookId = nCurrHookId
                End If
                ' calcolo distanza punto hook tavola dal punto hook della ventosa
                EgtStartPoint(nCurrHookId, GDB_ID.ROOT, ptCurrHook)
-         dDist = Point3d.DistXY(ptCurrHook, ptFixtHook)
+               dDist = Point3d.Dist(ptCurrHook, ptFixtHook)
+               'If nTableHookUsed <> nMoveId Then
+               '   ' calcolo distanza punto hook tavola dal punto hook della ventosa
+               '   EgtStartPoint(nCurrHookId, GDB_ID.ROOT, ptCurrHook)
+               '   dDist = Point3d.Dist(ptCurrHook, ptFixtHook)
+               'Else
+               '   EgtRemoveInfo(nCurrHookId, USED)
+               '   m_nPrevUsedHookId = nCurrHookId
+               '   Return
+               'End If
+               'If Not EgtGetInfo(nCurrHookId, USED, nTableHookUsed) Or nTableHookUsed = nMoveId Then
+               '   ' calcolo distanza punto hook tavola dal punto hook della ventosa
+               '   EgtStartPoint(nCurrHookId, GDB_ID.ROOT, ptCurrHook)
+               '   dDist = Point3d.Dist(ptCurrHook, ptFixtHook)
+               'Else
+               '   Return
+               'End If
             ElseIf nTableHookType = GDB_TY.CRV_LINE Then
-         ' verifico se utilizzato
-         Dim nTableHookUsed As Integer = GetHookUsed( nCurrHookId, nMoveId)
-         If nTableHookUsed <> GDB_ID.NULL AndAlso nTableHookUsed <> nMoveId Then
-            Return
-         End If
-         If nTableHookUsed = nMoveId Then
-            SetHookUsed(nCurrHookId, nMoveId, False)
-            m_nPrevUsedHookId = nCurrHookId
-         End If
                ' calcolo distanza linea hook tavola dal punto hook della ventosa
-         Dim ptL1 As Point3d : EgtStartPoint( nCurrHookId, GDB_ID.ROOT, ptL1)
+               Dim nRefId As Integer = 0
-         Dim ptL2 As Point3d : EgtEndPoint( nCurrHookId, GDB_ID.ROOT, ptL2)
+               Dim dU As Double = 0
-         ptCurrHook = DistPointSegment( ptFixtHook, ptL1, ptL2)
+               EgtPointCurveDist(ptFixtHook, nCurrHookId, nRefId, dDist, dU)
-         dDist = Point3d.DistXY( ptFixtHook, ptCurrHook)
+               EgtAtParamPoint(nCurrHookId, dU, GDB_ID.ROOT, ptCurrHook)
             Else
                Return
             End If
@@ -1177,6 +884,12 @@ Public NotInheritable Class DispositionUtility
                dNearestHookDist = dDist
                ptNearestHook = ptCurrHook
             End If
+         Else
+            Return
+         End If
+      Else
+         Return
+      End If
    End Sub
 
    ' Funzione che fissa il vettore di hook
@@ -1187,7 +900,7 @@ Public NotInheritable Class DispositionUtility
       ' recupero punto di hook
       Dim ptFixtHook As Point3d
       EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
-      m_vtHook = ptFixtHook - ptCurr
+      m_vtHook = ptCurr - ptFixtHook
    End Sub
 
    ' Funzione che restituisce il tipo di sottopezzo passatogli

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

@@ -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,33 +122,25 @@ 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
-         End If
-      ' altrimenti ventosa con movimento continuo
       Else
+         ' 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
@@ -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,21 +293,14 @@ 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
+               EgtSetInfo(nCurrHookId, used, nFixtureId)
-                  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 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)
       While nCurrHookId <> GDB_ID.NULL
          ' se punto di aggancio valido
@@ -315,52 +309,17 @@ 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
+               EgtSetInfo(nCurrHookId, USED, nFixtureId)
-                     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
-         nTableFixedId = EgtGetNextName( nTableFixedId, DispositionUtility.FIXED)
+      ' cerco hook su barre mobili
-      End While
+      Dim nMobileInd As Integer = 1
-      ' *** Cerco hook su barre mobili ***
+      Dim nMobile As Integer = EgtGetFirstNameInGroup(nTableId, DispositionUtility.MOBILE & nMobileInd)
-      Dim nBarId As Integer = EgtGetFirstGroupInGroup(nTableId)
+      While nMobile <> GDB_ID.NULL
-      While nBarId <> GDB_ID.NULL
+         nCurrHookId = EgtGetFirstNameInGroup(nMobile, DispositionUtility.HOOK)
-         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
@@ -368,59 +327,47 @@ 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
+                  EgtSetInfo(nCurrHookId, USED, nFixtureId)
-                              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
+         nMobileInd += 1
-               nCharId = EgtGetNextGroup(nCharId)
+         nMobile = EgtGetFirstNameInGroup(nTableId, DispositionUtility.MOBILE & nMobileInd)
-            End While
-         End If
-         nBarId = EgtGetNextGroup(nBarId)
       End While
       Return False
    End Function
 
-   ' Funzione che analizza l'hook e se valido ne restituisce la posizione (punto)
+   ' 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,
+   Private Shared Function HookAnalyzer(nCurrHookId As Integer, nFixtHookType As Integer, nFixtHookClass As Integer, ptFixtHook As Point3d, ByRef ptCurrHook As Point3d) As Boolean
-                                        ptFixtHook As Point3d, ByRef ptCurrHook As Point3d) As Boolean
+      ' verifico se del tipo giusto
-      ' 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
+      If (nTableHookType = GDB_TY.GEO_POINT And nFixtHookType = DispositionUtility.HOOKTYPE.POINT) OrElse (nTableHookType = GDB_TY.CRV_LINE And nFixtHookType = DispositionUtility.HOOKTYPE.LINE) Then
-         Not (nTableHookType = GDB_TY.CRV_LINE And nFixtHookType = DispositionUtility.HOOKTYPE.LINE) Then
+         ' verifico se della stessa classe
-         Return False
+         Dim nTableHookClass As Integer = 0
-      End If
+         EgtGetInfo(nCurrHookId, DispositionUtility.CLASS_, nTableHookClass)
-
+         If nTableHookClass = nFixtHookClass Then
-      ' 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
+               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 ptL1 As Point3d : EgtStartPoint( nCurrHookId, GDB_ID.ROOT, ptL1)
+               Dim nRefId As Integer = 0
-         Dim ptL2 As Point3d : EgtEndPoint( nCurrHookId, GDB_ID.ROOT, ptL2)
+               Dim dU As Double = 0
-         ptCurrHook = DispositionUtility.DistPointSegment( ptFixtHook, ptL1, ptL2)
+               EgtPointCurveDist(ptFixtHook, nCurrHookId, nRefId, dDist, dU)
+               EgtAtParamPoint(nCurrHookId, dU, GDB_ID.ROOT, ptCurrHook)
                Return True
             End If
+         End If
+      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)

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml

@@ -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}" 

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml

@@ -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}"

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

@@ -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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml

@@ -129,13 +129,13 @@
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                                        ParamTxBx="{Binding Path=OffSl,
+                                        ParamTxBx="{Binding Path=OffSr,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                                        ParamTxBx="{Binding Path=OffSr,
+                                        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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WaterjettingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodDrillingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodMillingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodSawingParameterExpanderV.xaml

@@ -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}"

OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb

@@ -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,11 +433,9 @@ 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
-      End If
    End Sub
 
 #End Region ' OperationListDoubleClickCommand

OptionPanel/MachiningOptionPanelV.xaml

@@ -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-->

OptionPanel/OptionPanelV.xaml

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

Project/ProjectVM.vb

@@ -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)
+                           m_PanelList.Add(New RightTrayV)
-                           'aggiungo RightTrayV alla griglia
-                           m_DynamicGrid.Children.Add(m_RightTrayV)
                            Map.refOptionPanelVM.SetPanelViewState(Element.ViewPanelState)
                         Case PLUGIN_LEFT_TRAY
-                           'm_PanelList.Add(New LeftTrayV)
+                           m_PanelList.Add(New LeftTrayV)
-                           ' aggiungo LeftTrayV alla griglia
-                           m_DynamicGrid.Children.Add(m_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_PanelList.Add(New BottomTrayV)
-         m_DynamicGrid.Children.Add(gridSplitter)
+         m_PanelList.Add(New TopTrayV)
-         '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)
          ' 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 TopTrayV)
+         m_PanelList.Add(New LeftTrayV)
-         'm_PanelList.Add(New LeftTrayV)
+         m_PanelList.Add(New RightTrayV)
-         'm_PanelList.Add(New RightTrayV)
+         m_PanelList.Add(New BottomTrayV)
-         '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)
       End If
-      'm_PanelList.Add(New SceneContentControlV)
+      m_PanelList.Add(New SceneContentControlV)
-      ' aggiungo SceneContentControlV alla griglia
-      m_DynamicGrid.Children.Add(m_SceneContentControlV)
-      m_PanelList.Add(m_DynamicGrid)
    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 = ""
+               Dim sName As String = ""
-               'EgtGetName(EgtGetParent(nId), sName)
+               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
+               ElseIf sName.Contains(DispositionUtility.MOBILE) Then
+                  Dim sInfo As String = ""
+                  If EgtGetInfo(EgtGetParent(nId), "MDir", sInfo) Then
                      m_SelType = DispositionUtility.SelType.BARS
-                  m_nIdToSel = nFixtureId
+                     m_nIdToSel = EgtGetParent(nId)
                      ' Drag possibile
                      m_bDrag = True
-                  Exit While
+                  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
 

RightTray/RightTrayV.xaml

@@ -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"
+      DockPanel.Dock="Right">
-      Margin="0.5,0,0,0">
-
    <local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
 </Grid>

StructureDataForMessenger.vb

@@ -1,4 +1,6 @@
 Imports EgtUILib
+Imports EgtWPFLib5
+Imports EgtWPFLib5.MachiningTreeViewItem
 
 Public Class PrepareInputBoxParam
    Friend sTitle As String
@@ -63,3 +65,111 @@ Public Class NewMachOpParam
    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

TopCommandBar/TopCommandBarVM.vb

@@ -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

Utility/Dictionary.xaml

@@ -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}}">
@@ -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>

WinFormPluginControl/WinFormPluginControlV.xaml

@@ -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}"

app.manifest

@@ -49,13 +49,13 @@
        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/PM</dpiAware>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
     </windowsSettings>
   </application>
-
+  -->
 
   <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
   <!--