-gestione finestra con griglia dinamica

- entrando in LAVORA si rende corrente la prima macchinata (anziché l'ultima).

Constants/ConstIni.vb

@@ -69,6 +69,7 @@ Module ConstIni
    Public Const K_SHOWGFRAME As String = "ShowGFrame"
    Public Const K_LINEWIDTH As String = "LineWidth"
    Public Const K_MARK As String = "Mark"
+   Public Const K_MARK2 As String = "Mark2"
    Public Const K_SELSURF As String = "SelSurf"
    Public Const K_SHOWMODE As String = "ShowMode"
    Public Const K_CURVEDIR As String = "CurveDir"
@@ -181,6 +182,9 @@ Module ConstIni
    Public Const K_SELGEOMGENMACHINING As String = "SelGeomGenMachining"
    Public Const K_SELGEOMCHISELING As String = "SelGeomChiseling"
    Public Const K_SELGEOMSURFFINISHING As String = "SelGeomSurfFinishing"
+   Public Const K_SELGEOMSURFROUGHING As String = "SelGeomSurfRoughing"
+   Public Const K_SELGEOMFIVEAXMILLING As String = "SelGeomFiveAxMilling"
+   Public Const K_SELVMILLQUALITY As String = "VMillQuality"
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
    Public Const K_SHOWONLYTABLE As String = "ShowOnlyTable"
    Public Const K_MOVETHROUGHDISPS As String = "MoveThroughDisps"

Constants/ConstMachIni.vb

@@ -35,7 +35,7 @@
    Public Const K_CHISELING As String = "Chiseling"
    Public Const K_SURFROUGHING As String = "SurfRoughing"
    Public Const K_SURFFINISHING As String = "SurfFinishing"
-   Public Const K_5AXMACHINING As String = "5axMachining"
+   Public Const K_5AXMILLING As String = "5AxMilling"
    Public Const K_WATERJETTING As String = "WaterJetting"
    Public Const K_SAWINGONARCS As String = "SawingOnArcs"
 

DrawPanel/DrawPanelV.xaml

@@ -9,90 +9,157 @@
 
    <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Expander Name="Draw2D" Style="{StaticResource ExpanderStyle}" Grid.Row="0"
-         IsExpanded="{Binding Draw2DIsExpanded}">
+                IsExpanded="{Binding Draw2DIsExpanded}">
          <Expander.Header>
             <TextBlock Text="{Binding Draw2DMsg}"/>
          </Expander.Header>
          <UniformGrid Columns="3">
-            <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button x:Name="PuntoBtn" ToolTip="Punto" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PointBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Point+.png" Stretch="Uniform"/>
-               <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Vettore" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding PointVectorCommand}">
+                        <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
+                     </Button>
+                     <Button ToolTip="Riferimento" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding PointReferenceCommand}">
+                        <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
             </Button>
-            <Button ToolTip="{Binding Line2PToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Linea 2 Punti" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding Line2PBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+               <Image Source="/Resources/DrawPanel/Line2P+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Linea 2 Punti con Continuazione" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding Line2PContinuationCommand}">
+                        <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
             </Button>
-            <Button ToolTip="{Binding LinePDLToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Linea Punto Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding LinePDLBaseCommand}" 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"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcCSE.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Arc3PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Arc3P.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding ArcPDPToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Arco " Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
+               <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"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCP.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Circle3PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Circle3P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Rectangle2PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Rectangle2P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding PolygonToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Polygon.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding PolygonSideToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Quota Lineare" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding LinearDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
+               <Image Source="/Resources/DrawPanel/LinearDimension+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Quota Allineata" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding AlignedDimensionCommand}">
+                        <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
             </Button>
-            <Button ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Quota Angolare" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding AngularDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
+               <Image Source="/Resources/DrawPanel/AngularDimension +.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Quota Angolare Avanzata" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding AlignedDimensionPlusCommand}">
+                        <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
             </Button>
-            <Button ToolTip="{Binding DiamRadDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Quota Diametrale" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding DiamRadDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding DiamDimensionCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
+               <Image Source="/Resources/DrawPanel/DiametralDimension+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Quota Radiale" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding RadDimensionCommand}">
+                        <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
             </Button>
-            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Testo" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding TextBaseCommand}" 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>
@@ -102,95 +169,135 @@
             <TextBlock Text="{Binding Draw3DMsg}"/>
          </Expander.Header>
          <UniformGrid Columns="3">
-            <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Piano Contornato" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding FloorCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
-               <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
+               <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"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding RevolveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Revolve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ScrewToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Screw.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SweptToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Swept.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding RuledToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Ruled.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidAddSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidAddSurf.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding SolidSubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Sottrai Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding SubtractSurfacesCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
+               <Image Source="/Resources/DrawPanel/SolidSubtractSurf+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Taglia Superficie con Superficie Inversa" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding CutSurfacesCommand}">
+                        <Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
             </Button>
-            <Button ToolTip="{Binding SolidIntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Interseca Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding IntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
+               <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"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/IntersectSurfSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractLoops.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractFacetLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractFacetLoops.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding ExplodeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Esplodi Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ExplodeSurfaceCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
+               <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"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractSurfFacet.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding MergeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/MergeSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding InvertSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/InvertSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ApproxSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding StmMoveVertexFacetToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Muovi Vertice di Superficie" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding MoveStmVertexCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
+               <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>
@@ -200,14 +307,22 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding ChangeLayerToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Cambia Layer" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ChangeLayerBaseCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
+               <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"
@@ -215,108 +330,159 @@
                <Image Source="/Resources/DrawPanel/ChangeStatus.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeColor.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeAlphaToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeColorAlpha.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ResetColorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/RemoveColor.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding InvertCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeStartToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True" 
+                    ToolTipService.ShowOnDisabled="True" 
-               Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtendCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtendCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding BreakCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/BreakCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SplitCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SplitCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExplodeCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeCurve.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding JoinCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Unisci Curve" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding JoinCurveBasCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
-               <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
+               <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"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Offset.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding FilletToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Fillet.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChamferToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding ArcFlipToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Arco Capovolto" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding UpsideDownArchCommand}" ToolTipService.ShowOnDisabled="True" IsEnabled="{Binding bSelOk}">
-               Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ArcFlip+.png" Stretch="Uniform"/>
-               <Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
+               <Button.ContextMenu >
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Arco Esplementare" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding ComplementaryArchCommand}">
+                        <Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
             </Button>
             <Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
-             </Button>
+            </Button>
-             <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Aggiungi Punto" Style="{StaticResource DrawPanelButton}"
-                ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-                Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding AddPointCommand}" IsEnabled="{Binding bSelOk}">
-                <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+               <Image Source="/Resources/DrawPanel/AddPointCurve+.png" Stretch="Uniform"/>
-             </Button>
+               <Button.ContextMenu>
-             <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-                ToolTipService.ShowOnDisabled="True"
+                     <Button ToolTip="Trasforma in Arco" Style="{StaticResource DrawPanelButton}"
-                Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
+                             Command="{Binding TrasformArcCommand}">
-                <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+                        <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-             </Button>
+                     </Button>
-            <Button ToolTip="{Binding ApproxCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                     <Button ToolTip="Chiudi Curva Composita" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                             Command="{Binding CloseCurveCommand}">
-               Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
+                        <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-               <Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Rimuovi Punto" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RemoveCurveCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/RemovePointCurve+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Trasforma in Retta" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding TrasformRectCommand}">
+                        <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+                     </Button>
+                     <Button ToolTip="Apri Curva Composita" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding OpenCurveCommand}">
+                        <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Approssima Curva" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ApproxCurveBaseCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ApproxCurve+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Approssima Curva con Linee" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding ApproxCurveLineCommand}">
+                        <Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
             </Button>
             <Button ToolTip="{Binding ModifyArcRadiusToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyArcRadius.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ModifyTextToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyText.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -327,8 +493,8 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
             </Button>
             <Button Style="{StaticResource DrawPanelButton}"
@@ -336,33 +502,33 @@
             <Button Style="{StaticResource DrawPanelButton}"
                     Visibility="Hidden"/>
             <Button ToolTip="{Binding RotateToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding MirrorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ScaleToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Rotate3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Rotate3D.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Mirror3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror3D.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Scale3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale3D.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>

EgtCAM5.vbproj

@@ -170,6 +170,9 @@
       <DependentUpon>EstimationsExpanderV.xaml</DependentUpon>
     </Compile>
     <Compile Include="OptionPanel\MachiningOptionPanel\EstimationsExpander\EstimationsExpander.vb" />
+    <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\FiveAxisMachinigParameterExpanderV.xaml.vb">
+      <DependentUpon>FiveAxisMachinigParameterExpanderV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\SurfFinishingParameterExpanderV.xaml.vb">
       <DependentUpon>SurfFinishingParameterExpanderV.xaml</DependentUpon>
     </Compile>
@@ -188,6 +191,9 @@
     <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\StoneDrillingParameterExpanderV.xaml.vb">
       <DependentUpon>StoneDrillingParameterExpanderV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\SurfRoughingParameterExpanderV.xaml.vb">
+      <DependentUpon>SurfRoughingParameterExpanderV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\WoodDrillingParameterExpanderV.xaml.vb">
       <DependentUpon>WoodDrillingParameterExpanderV.xaml</DependentUpon>
     </Compile>
@@ -466,6 +472,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\FiveAxisMachinigParameterExpanderV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\SurfFinishingParameterExpanderV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -490,6 +500,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\SurfRoughingParameterExpanderV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\WoodDrillingParameterExpanderV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1021,6 +1035,66 @@
   <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

@@ -3,7 +3,6 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:local="clr-namespace:EgtCAM5"
       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 = EgtGetLastMachGroup()
+            nGroupId = EgtGetFirstMachGroup()
             Return If(EgtSetCurrMachGroup(nGroupId), 0, 1)
          ' se altrimenti ammessi gruppi di lavoro vuoti
          ElseIf bAllowEmpty Then
@@ -422,6 +422,8 @@ Public Class MyMachGroupPanelVM
                      (EgtUILib.GetPrivateProfileInt(S_ESTIMATIONS, K_EST_ENABLE, 0, IniFile.m_sCurrMachIniFilePath) <> 0)
          ' Setto il Materiale in base alla Macchina associata al MachGroup corrente
          LoadMaterialType()
+         ' Zoom all
+         EgtZoom( ZM.ALL)
       End If
 
       Return True

MachinePanel/MyMachinePanelVM.vb

@@ -269,7 +269,7 @@ Public Class MyMachinePanelVM
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True)
       Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 794 '674
+         MachDbWindowV.Height = 800 '674
          MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()
@@ -290,7 +290,7 @@ Public Class MyMachinePanelVM
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True)
       Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 794 '674
+         MachDbWindowV.Height = 800 '674
          MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()

MainWindow/MainWindowV.xaml

@@ -1,15 +1,16 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            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:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+                            xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   xmlns:local="clr-namespace:EgtCAM5"
+                            xmlns:local="clr-namespace:EgtCAM5"
-   Title="{Binding Title}" Icon="{Binding IconSource}"
+                            Title="{Binding Title}" Icon="{Binding IconSource}"
-   TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
-   BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
+                            BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
-   MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
+                            MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
-   AboutBoxCommand="{Binding AboutBoxCommand}"
+                            AboutBoxCommand="{Binding AboutBoxCommand}"
-   AllowDrop="True" Drop="MainWindow_Drop"
+                            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,6 +16,7 @@ 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
 
@@ -385,8 +386,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2605, 1, IniFile.m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2611, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2605, 1, IniFile.m_nKeyOptions)
+                            EgtGetKeyOptions(3279, 2611, 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
@@ -597,6 +598,12 @@ Public Class MainWindowVM
          ' pulisco output
          Map.refStatusBarVM.NotifyStatusOutput("")
          Map.refInputExpanderVM.ResetInputBox()
+      ElseIf e.Key = Key.Left OrElse e.Key = Key.Right OrElse e.Key = Key.Up OrElse e.Key = Key.Down AndAlso
+             Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
+         Map.refMachiningParameterExpanderVM.FocusSlider()
+         Dim nStep As Integer = If(e.Key = Key.Right OrElse e.Key = Key.Up, 1, -1)
+         Map.refMachiningParameterExpanderVM.SetSliderValue(nStep)
+         e.Handled = True
       End If
    End Sub
 

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.5.1")>
+<Assembly: AssemblyVersion("2.6.11.1")>
-<Assembly: AssemblyFileVersion("2.6.5.1")>
+<Assembly: AssemblyFileVersion("2.6.11.1")>
 

OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml

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

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml

@@ -1,9 +1,9 @@
 <UserControl x:Class="ManageLayerExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             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:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:expression="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions"
+             xmlns:expression="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions"
-   xmlns:local="clr-namespace:EgtCAM5">
+             xmlns:local="clr-namespace:EgtCAM5">
 
    <Expander IsExpanded="True" Style="{StaticResource ExpanderStyle}">
       <Expander.Header>
@@ -21,10 +21,10 @@
             <Button Content="{Binding ColorMsg}" Command="{Binding LayerColorCommand}"  Height="30"/>
          </UniformGrid>
          
-         <TreeView Name="LayerTreeView" MinHeight="150" MaxHeight="250" 
+         <TreeView Name="LayerTreeView" MinHeight="250" MaxHeight="400" 
-            ItemsSource="{Binding Path=LayerList}"
+                   ItemsSource="{Binding Path=LayerList}"
-            VirtualizingStackPanel.IsVirtualizing = "True"
+                   VirtualizingStackPanel.IsVirtualizing = "True"
-            VirtualizingStackPanel.VirtualizationMode = "Recycling">
+                   VirtualizingStackPanel.VirtualizationMode = "Recycling">
             <interactivity:Interaction.Triggers>
                <interactivity:EventTrigger EventName="MouseDoubleClick">
                   <interactivity:InvokeCommandAction Command="{Binding TreeViewDoubleClickCommand}"/>

OptionPanel/DrawOptionPanelV.xaml

@@ -1,16 +1,30 @@
 <UserControl x:Class="DrawOptionPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
 
-   <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+   <!--<StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+      --><!--ContentPresenter that contains the ManageLayerExpander--><!--
+      <ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
+      --><!--ContentPresenter that contains the InfoExpander--><!--
+      <ContentPresenter Content="{Binding InfoExpander}"/>
+      --><!--ContentPresenter that contains the InputExpander--><!--
+      <ContentPresenter Content="{Binding InputExpander}"/>
+   </StackPanel>-->
+   <Grid Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
       <!--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 Content="{Binding InfoExpander}"/>
+      <ContentPresenter Grid.Row="1" Content="{Binding InfoExpander}"/>
+      <GridSplitter Grid.Row="1" Height="5" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"/>
       <!--ContentPresenter that contains the InputExpander-->
-      <ContentPresenter Content="{Binding InputExpander}"/>
+      <ContentPresenter Grid.Row="2" Content="{Binding InputExpander}"/>
-   </StackPanel>
+   </Grid>
 
 </UserControl>

OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb

@@ -177,12 +177,17 @@ Public Class EstimationsExpanderVM
       If Not bOk Then Return False
       ' Calcolo della stima
       If Not EgtEstimate(sEstFile, sInfo) Then
-         If EgtGetLastMachMgrErrorId() <> 0 Then
+         Dim nErr As Integer = EgtGetLastMachMgrErrorId()
+         If nErr = 1000 Then
+            MessageBox.Show(EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+         ElseIf nErr = 1001 Then
+            MessageBox.Show(EgtMsg(5334), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+         ElseIf nErr <> 0 Then
             Dim sErr As String = EgtGetLastMachMgrErrorString()
             sErr = sErr.Replace("Cnc", "Est")
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+            MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Else
-            MessageBox.Show(EgtMsg(MSG_SIMULATION + 17), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+            MessageBox.Show(EgtMsg(5317), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)
          End If
          bOk = False
       End If

OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb

@@ -150,6 +150,8 @@ Public Class MachiningTreeExpanderVM
             Return EgtMsg(MSG_MACHININGSDBPAGE + 11)
          Case MCH_MY.WATERJETTING
             Return EgtMsg(MSG_MACHININGSDBPAGE + 12)
+         Case MCH_MY.FIVEAXISMILLING
+            Return EgtMsg(31213)
          Case Else
             Return "Mach"
       End Select

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb

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

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

@@ -5,8 +5,6 @@ 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
@@ -122,27 +120,35 @@ Public Class FixtureParametersVM
          OnPropertyChanged("FixtureErrorMsg")
          Return
       End If
+      ' dimensioni tavola
+      Dim vtTabDim As Vector3d = ptTableMax - ptTableMin
       ' calcolo il centro della tavola
-      Dim ptTableMid As New Point3d((ptTableMax.x - ptTableMin.x) / 2, (ptTableMax.y - ptTableMin.y) / 2, (ptTableMax.z - ptTableMin.z) / 2)
+      Dim ptTableMid As Point3d = Point3d.ORIG() + 0.5 * vtTabDim
       ' posiziono il nuovo sottopezzo al centro della tavola
-      Dim nAddedFixtureId As Integer = EgtAddFixture(SelectedFixture.Name, ptTableMid, 0, 0)
+      Dim nAddedFixtureId As Integer = EgtAddFixture(SelectedFixture.Name, ptTableMid, 0, 20)
       If nAddedFixtureId = GDB_ID.NULL Then
          m_FixtureErrorMsg = "Impossibile posizionare la ventosa sulla tavola"
          OnPropertyChanged("FixtureErrorMsg")
          Return
       End If
-      ' verifico se la ventosa ha punti di hook da ancorare
+      ' Se la ventosa ha punti di hook da ancorare
       If IsFixtureWithHook(nAddedFixtureId) Then
          If Not PositionFixtureOnNearestHook(nAddedFixtureId) Then
-            ' non ci sono punti liberi, quindi rimuovo la ventosa e segnalo
+            EgtMoveFixture( nAddedFixtureId, 0.2 * vtTabDim.y * Vector3d.Y_AX())
-            EgtRemoveFixture(nAddedFixtureId)
+            If Not PositionFixtureOnNearestHook(nAddedFixtureId) Then
-            MessageBox.Show("No free hook point!", "ERROR")
+               EgtMoveFixture( nAddedFixtureId, 0.2 * vtTabDim.y * Vector3d.Y_AX())
-            Return
+               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
-      ' verifico se è in una posizione valida
+         If Not DispositionUtility.VerifyFixturePosition(nAddedFixtureId, New Vector3d) Then
-      If Not DispositionUtility.VerifyFixturePosition(nAddedFixtureId, New Vector3d) Then
             ' se non trovo una posizione valida, esco
             If Not SearchOkFixturePosition(nAddedFixtureId, ptTableMin, ptTableMax, ptTableMid) Then
                Return
@@ -157,76 +163,76 @@ Public Class FixtureParametersVM
 
    ' Funzione che cerca una posizione valida per la ventosa libera di muoversi
    Private Function SearchOkFixturePosition(nAddedFixtureId As Integer, ptTableMin As Point3d, ptTableMax As Point3d, ptTableMid As Point3d) As Boolean
-         ' creo un gruppo temporaneo
+      ' creo un gruppo temporaneo
-         Dim nTempGroupId As Integer = EgtCreateGroup(GDB_ID.ROOT)
+      Dim nTempGroupId As Integer = EgtCreateGroup(GDB_ID.ROOT)
-         EgtSetLevel(nTempGroupId, GDB_LV.USER)
+      EgtSetLevel(nTempGroupId, GDB_LV.USER)
-         EgtSetMode(nTempGroupId, GDB_MD.STD)
+      EgtSetMode(nTempGroupId, GDB_MD.STD)
-         ' calcolo ingombro sottopezzo aggiunto
+      ' calcolo ingombro sottopezzo aggiunto
-         Dim bboxAddedFixture As New BBox3d
+      Dim bboxAddedFixture As New BBox3d
-         EgtGetBBoxGlob(nAddedFixtureId, GDB_BB.STANDARD, bboxAddedFixture)
+      EgtGetBBoxGlob(nAddedFixtureId, GDB_BB.STANDARD, bboxAddedFixture)
-         ' calcolo bbox tavolo
+      ' calcolo bbox tavolo
-         Dim bboxTableArea As New BBox3d(ptTableMin, ptTableMax)
+      Dim bboxTableArea As New BBox3d(ptTableMin, ptTableMax)
-         bboxTableArea.Expand(-bboxAddedFixture.DimX / 2, -bboxAddedFixture.DimY / 2, 0)
+      bboxTableArea.Expand(-bboxAddedFixture.DimX / 2, -bboxAddedFixture.DimY / 2, 0)
-         ' creo superficie delle misure della tavola
+      ' creo superficie delle misure della tavola
-         Dim nTableFrId As Integer = EgtCreateSurfFrRectangle(nTempGroupId, bboxTableArea.Min, bboxTableArea.Max)
+      Dim nTableFrId As Integer = EgtCreateSurfFrRectangle(nTempGroupId, bboxTableArea.Min, bboxTableArea.Max)
-         ' ciclo su tutti i pezzi di questa fase
+      ' ciclo su tutti i pezzi di questa fase
-         Dim nFixtureId As Integer = EgtGetFirstFixture()
+      Dim nFixtureId As Integer = EgtGetFirstFixture()
-         While nFixtureId <> GDB_ID.NULL
+      While nFixtureId <> GDB_ID.NULL
-            ' creo il bbox del sottopezzo
+         ' creo il bbox del sottopezzo
-            Dim bboxFixture As New BBox3d
+         Dim bboxFixture As New BBox3d
-            EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
+         EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
-            ' faccio offset del bbox del sottopezzo per includere metà del sottopezzo da aggiungere
+         ' faccio offset del bbox del sottopezzo per includere metà del sottopezzo da aggiungere
-            bboxFixture.Expand(bboxAddedFixture.DimX / 2, bboxAddedFixture.DimY / 2, 0)
+         bboxFixture.Expand(bboxAddedFixture.DimX / 2, bboxAddedFixture.DimY / 2, 0)
-            ' lo porto all'altezza della tavola
+         ' lo porto all'altezza della tavola
-            Dim ptMinFixtureFr As New Point3d(bboxFixture.Min)
+         Dim ptMinFixtureFr As New Point3d(bboxFixture.Min)
-            Dim ptMaxFixtureFr As New Point3d(bboxFixture.Max)
+         Dim ptMaxFixtureFr As New Point3d(bboxFixture.Max)
-            ptMinFixtureFr.z = ptTableMin.z
+         ptMinFixtureFr.z = ptTableMin.z
-            ptMaxFixtureFr.z = ptTableMin.z
+         ptMaxFixtureFr.z = ptTableMin.z
-            ' creo la regione occupata dal bbox del sottopezzo
+         ' creo la regione occupata dal bbox del sottopezzo
-            Dim nFixtureFrId As Integer = EgtCreateSurfFrRectangle(nTempGroupId, ptMinFixtureFr, ptMaxFixtureFr)
+         Dim nFixtureFrId As Integer = EgtCreateSurfFrRectangle(nTempGroupId, ptMinFixtureFr, ptMaxFixtureFr)
-            ' sottraggo la regione del sottopezzo da quella della tavola
+         ' sottraggo la regione del sottopezzo da quella della tavola
-            Dim x = EgtSurfFrSubtract(nTableFrId, nFixtureFrId)
+         Dim x = EgtSurfFrSubtract(nTableFrId, nFixtureFrId)
-            nFixtureId = EgtGetNextFixture(nFixtureId)
+         nFixtureId = EgtGetNextFixture(nFixtureId)
-         End While
+      End While
-         ' creo gruppo con i bordi della regione di tavola avanzata
+      ' creo gruppo con i bordi della regione di tavola avanzata
-         Dim TableFrBorderGroupId As Integer = EgtCreateGroup(nTempGroupId)
+      Dim TableFrBorderGroupId As Integer = EgtCreateGroup(nTempGroupId)
-         Dim nTableFrBorderCount As Integer = 0
+      Dim nTableFrBorderCount As Integer = 0
-         Dim nChunk As Integer = EgtSurfFrChunkCount(nTableFrId)
+      Dim nChunk As Integer = EgtSurfFrChunkCount(nTableFrId)
-         For Index = 0 To nChunk - 1
+      For Index = 0 To nChunk - 1
-            EgtExtractSurfFrChunkLoops(nTableFrId, Index, TableFrBorderGroupId, nTableFrBorderCount)
+         EgtExtractSurfFrChunkLoops(nTableFrId, Index, TableFrBorderGroupId, nTableFrBorderCount)
-         Next
+      Next
-         ' verifico se c'è almeno un bordo
+      ' verifico se c'è almeno un bordo
-         If nTableFrBorderCount = 0 Then
+      If nTableFrBorderCount = 0 Then
-            m_FixtureErrorMsg = "Impossibile posizionare la ventosa sulla tavola"
+         m_FixtureErrorMsg = "Impossibile posizionare la ventosa sulla tavola"
-            OnPropertyChanged("FixtureErrorMsg")
+         OnPropertyChanged("FixtureErrorMsg")
-         Return False
+      Return False
+      End If
+      ' converto il punto medio della tavola in coordinate globali
+      Dim PtTableRef As Point3d
+      EgtGetTableRef(1, PtTableRef)
+      Dim frTableRef As New Frame3d(PtTableRef)
+      ptTableMid.ToGlob(frTableRef)
+      ' ciclo sui bordi per trovare il punto più vicino
+      Dim dMinDist As Double = (bboxTableArea.Max - bboxTableArea.Min).SqLenXY
+      Dim ptMinAbs As Point3d
+      Dim BorderId As Integer = EgtGetFirstInGroup(TableFrBorderGroupId)
+      While BorderId <> GDB_ID.NULL
+         Dim dDist As Double = 0
+         Dim ptMinRel As Point3d
+         Dim nSide As Integer = 0
+         EgtPointCurveDistSide(ptTableMid, BorderId, Vector3d.Z_AX, GDB_ID.ROOT, dDist, ptMinRel, nSide)
+         If dDist < dMinDist Then
+            dMinDist = dDist
+            ptMinAbs = ptMinRel
          End If
-         ' converto il punto medio della tavola in coordinate globali
+         BorderId = EgtGetNext(BorderId)
-         Dim PtTableRef As Point3d
+      End While
-         EgtGetTableRef(1, PtTableRef)
+      ' sposto il sottopezzo nel punto trovato
-         Dim frTableRef As New Frame3d(PtTableRef)
+      Dim vtFixtureMove As Vector3d = ptMinAbs - ptTableMid
-         ptTableMid.ToGlob(frTableRef)
+      vtFixtureMove.z = 0
-         ' ciclo sui bordi per trovare il punto più vicino
+      EgtMoveFixture(nAddedFixtureId, vtFixtureMove)
-         Dim dMinDist As Double = (bboxTableArea.Max - bboxTableArea.Min).SqLenXY
+      ' cancello il gruppo temporaneo
-         Dim ptMinAbs As Point3d
+      EgtErase(nTempGroupId)
-         Dim BorderId As Integer = EgtGetFirstInGroup(TableFrBorderGroupId)
-         While BorderId <> GDB_ID.NULL
-            Dim dDist As Double = 0
-            Dim ptMinRel As Point3d
-            Dim nSide As Integer = 0
-            EgtPointCurveDistSide(ptTableMid, BorderId, Vector3d.Z_AX, GDB_ID.ROOT, dDist, ptMinRel, nSide)
-            If dDist < dMinDist Then
-               dMinDist = dDist
-               ptMinAbs = ptMinRel
-            End If
-            BorderId = EgtGetNext(BorderId)
-         End While
-         ' sposto il sottopezzo nel punto trovato
-         Dim vtFixtureMove As Vector3d = ptMinAbs - ptTableMid
-         vtFixtureMove.z = 0
-         EgtMoveFixture(nAddedFixtureId, vtFixtureMove)
-         ' cancello il gruppo temporaneo
-         EgtErase(nTempGroupId)
       Return True
    End Function
 
@@ -239,9 +245,7 @@ Public Class FixtureParametersVM
       ' leggo tipo 
       Dim sType As String = ""
       EgtGetInfo(nFixtHookId, DispositionUtility.TYPE, sType)
-      If sType.Equals(DispositionUtility.FREE) Then
+      If sType.Equals(DispositionUtility.POINT) Then
-         Return False
-      ElseIf sType.Equals(DispositionUtility.POINT) Then
          Return True
       ElseIf sType.Equals(DispositionUtility.LINE) Then
          Return True
@@ -250,7 +254,7 @@ Public Class FixtureParametersVM
       End If
    End Function
 
-   ' Funzione che aggancia la ventosa al più vicino hook libero
+   ' Funzione che cerca un hook libero adatto alla ventosa e se trovato la posiziona
    Friend Shared Function PositionFixtureOnNearestHook(nFixtureId As Integer) As Boolean
       ' cerco punto hook sulla ventosa
       Dim nFixtSolidId As Integer = EgtGetFirstNameInGroup(nFixtureId, SOLID)
@@ -262,26 +266,21 @@ Public Class FixtureParametersVM
       Dim nFixtHookType As DispositionUtility.HOOKTYPE = DispositionUtility.HOOKTYPE.FREE
       Dim sType As String = ""
       EgtGetInfo(nFixtHookId, DispositionUtility.TYPE, sType)
-      If sType.Equals(DispositionUtility.FREE) Then
+      If sType.Equals(DispositionUtility.POINT) 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)
-      ' cerco id tavola
+      ' Recupero Id tavola corrente
       Dim sTableName As String = ""
       EgtGetTableName(sTableName)
       Dim nTableId As Integer = EgtGetTableId(sTableName)
-      ' cerco hook su tavola macchina
+      ' *** Cerco hook su tavola ***
       Dim nTableSolidId As Integer = EgtGetFirstNameInGroup(nTableId, SOLID)
       Dim nCurrHookId As Integer = EgtGetFirstNameInGroup(nTableSolidId, DispositionUtility.HOOK)
       ' Punto di hook a cui spostare la ventosa
@@ -293,33 +292,22 @@ Public Class FixtureParametersVM
             EgtMoveFixture(nFixtureId, ptCurrHook - ptFixtHook)
             ' verifico se è in una posizione valida
             If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
-               EgtSetInfo(nCurrHookId, used, nFixtureId)
+               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 hook su barra fissa
+      ' *** Cerco hook su barre fisse ***
       Dim nTableFixedId As Integer = EgtGetFirstNameInGroup(nTableId, DispositionUtility.FIXED)
-      nCurrHookId = EgtGetFirstNameInGroup(nTableFixedId, DispositionUtility.HOOK)
+      While nTableFixedId <> GDB_ID.NULL
-      While nCurrHookId <> GDB_ID.NULL
+         nCurrHookId = EgtGetFirstNameInGroup(nTableFixedId, DispositionUtility.HOOK)
-         ' se punto di aggancio valido
-         If HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, ptCurrHook) Then
-            ' sposto la ventosa
-            EgtMoveFixture(nFixtureId, ptCurrHook - ptFixtHook)
-            ' verifico se è in una posizione valida
-            If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
-               EgtSetInfo(nCurrHookId, USED, nFixtureId)
-               Return True
-            End If
-         End If
-         nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
-      End While
-      ' cerco hook su barre mobili
-      Dim nMobileInd As Integer = 1
-      Dim nMobile As Integer = EgtGetFirstNameInGroup(nTableId, DispositionUtility.MOBILE & nMobileInd)
-      While nMobile <> GDB_ID.NULL
-         nCurrHookId = EgtGetFirstNameInGroup(nMobile, DispositionUtility.HOOK)
          While nCurrHookId <> GDB_ID.NULL
             ' se punto di aggancio valido
             If HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, ptCurrHook) Then
@@ -327,46 +315,111 @@ Public Class FixtureParametersVM
                EgtMoveFixture(nFixtureId, ptCurrHook - ptFixtHook)
                ' verifico se è in una posizione valida
                If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
-                  EgtSetInfo(nCurrHookId, USED, nFixtureId)
+                  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
-         nMobileInd += 1
+         nTableFixedId = EgtGetNextName( nTableFixedId, DispositionUtility.FIXED)
-         nMobile = EgtGetFirstNameInGroup(nTableId, DispositionUtility.MOBILE & nMobileInd)
+      End While
+      ' *** Cerco hook su barre mobili ***
+      Dim nBarId As Integer = EgtGetFirstGroupInGroup(nTableId)
+      While nBarId <> GDB_ID.NULL
+         Dim sBarName As String = ""
+         If EgtGetName( nBarId, sBarName) AndAlso EgtGetAxisId( sBarName) <> GDB_ID.NULL Then
+            nCurrHookId = EgtGetFirstNameInGroup(nBarId, DispositionUtility.HOOK)
+            While nCurrHookId <> GDB_ID.NULL
+               ' se punto di aggancio valido
+               If HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, ptCurrHook) Then
+                  ' sposto la ventosa
+                  Dim vtMove As Vector3d = ptCurrHook - ptFixtHook
+                  EgtMoveFixture(nFixtureId, vtMove)
+                  ' verifico se è in una posizione valida
+                  If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
+                     If nFixtHookType = DispositionUtility.HOOKTYPE.POINT then
+                        DispositionUtility.SetHookUsed( nCurrHookId, nFixtureId)
+                     Else
+                        DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
+                     End If
+                     Return True
+                  Else
+                     EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
+                  End If
+               End If
+               nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
+            End While
+            ' Cerco su eventuali carrelli
+            Dim nCharId As Integer = EgtGetFirstGroupInGroup(nBarId)
+            While nCharId <> GDB_ID.NULL
+               Dim sCharName As String = ""
+               If EgtGetName( nCharId, sCharName) AndAlso EgtGetAxisId( sCharName) <> GDB_ID.NULL Then 
+                  nCurrHookId = EgtGetFirstNameInGroup(nCharId, DispositionUtility.HOOK)
+                  While nCurrHookId <> GDB_ID.NULL
+                     ' se punto di aggancio valido
+                     If HookAnalyzer(nCurrHookId, nFixtHookType, nFixtHookClass, ptFixtHook, ptCurrHook) Then
+                        ' sposto la ventosa
+                        EgtMoveFixture(nFixtureId, ptCurrHook - ptFixtHook)
+                        ' verifico se è in una posizione valida
+                        If DispositionUtility.VerifyFixturePosition(nFixtureId, New Vector3d) Then
+                           If nFixtHookType = DispositionUtility.HOOKTYPE.POINT then
+                              DispositionUtility.SetHookUsed( nCurrHookId, nFixtureId)
+                           Else
+                              DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
+                           End If
+                           Return True
+                        Else
+                           EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
+                        End If
+                     End If
+                     nCurrHookId = EgtGetNextName(nCurrHookId, DispositionUtility.HOOK)
+                  End While
+               End If
+               nCharId = EgtGetNextGroup(nCharId)
+            End While
+         End If
+         nBarId = EgtGetNextGroup(nBarId)
       End While
       Return False
    End Function
 
-   ' Funzione che analizza l'hook e se valido ne prestituisce lo posizione(punto)
+   ' Funzione che analizza l'hook e se valido ne restituisce la posizione (punto)
-   Private Shared Function HookAnalyzer(nCurrHookId As Integer, nFixtHookType As Integer, nFixtHookClass As Integer, ptFixtHook As Point3d, ByRef ptCurrHook As Point3d) As Boolean
+   Private Shared Function HookAnalyzer(nCurrHookId As Integer, nFixtHookType As Integer, nFixtHookClass As Integer,
-      ' verifico se del tipo giusto
+                                        ptFixtHook As Point3d, ByRef ptCurrHook As Point3d) As Boolean
+      ' Verifico se del tipo giusto
       Dim nTableHookType As GDB_TY = EgtGetType(nCurrHookId)
-      If (nTableHookType = GDB_TY.GEO_POINT And nFixtHookType = DispositionUtility.HOOKTYPE.POINT) OrElse (nTableHookType = GDB_TY.CRV_LINE And nFixtHookType = DispositionUtility.HOOKTYPE.LINE) Then
+      If Not (nTableHookType = GDB_TY.GEO_POINT And nFixtHookType = DispositionUtility.HOOKTYPE.POINT) AndAlso
-         ' verifico se della stessa classe
+         Not (nTableHookType = GDB_TY.CRV_LINE And nFixtHookType = DispositionUtility.HOOKTYPE.LINE) Then
-         Dim nTableHookClass As Integer = 0
+         Return False
-         EgtGetInfo(nCurrHookId, DispositionUtility.CLASS_, nTableHookClass)
+      End If
-         If nTableHookClass = nFixtHookClass Then
+
-            Dim dDist As Double = 0
+      ' Verifico se della stessa classe
-            ' punto a distanza minima sull'hook
+      Dim nTableHookClass As Integer = DispositionUtility.GetHookClass( nCurrHookId)
-            If nTableHookType = GDB_TY.GEO_POINT Then
+      If nTableHookClass <> nFixtHookClass Then
-               ' verifico se utilizzato
+         Return False
-               Dim nTableHookUsed As Boolean = False
+      End If
-               If Not EgtGetInfo(nCurrHookId, DispositionUtility.USED, nTableHookUsed) Then
+
-                  ' calcolo distanza punto hook tavola dal punto hook della ventosa
+      Dim dDist As Double = 0
-                  EgtStartPoint(nCurrHookId, GDB_ID.ROOT, ptCurrHook)
+      ' punto a distanza minima sull'hook
-                  Return True
+      If nTableHookType = GDB_TY.GEO_POINT Then
-               End If
+         ' verifico se utilizzato
-            ElseIf nTableHookType = GDB_TY.CRV_LINE Then
+         If Not DispositionUtility.GetIsHookUsed( nCurrHookId) Then
-               ' calcolo distanza linea hook tavola dal punto hook della ventosa
+            ' calcolo distanza punto hook tavola dal punto hook della ventosa
-               Dim nRefId As Integer = 0
+            EgtStartPoint(nCurrHookId, GDB_ID.ROOT, ptCurrHook)
-               Dim dU As Double = 0
+            Return True
-               EgtPointCurveDist(ptFixtHook, nCurrHookId, nRefId, dDist, dU)
-               EgtAtParamPoint(nCurrHookId, dU, GDB_ID.ROOT, ptCurrHook)
-               Return True
-            End If
          End If
+      ElseIf nTableHookType = GDB_TY.CRV_LINE Then
+         ' calcolo distanza linea hook tavola dal punto hook della ventosa
+         Dim ptL1 As Point3d : EgtStartPoint( nCurrHookId, GDB_ID.ROOT, ptL1)
+         Dim ptL2 As Point3d : EgtEndPoint( nCurrHookId, GDB_ID.ROOT, ptL2)
+         ptCurrHook = DispositionUtility.DistPointSegment( ptFixtHook, ptL1, ptL2)
+         Return True
       End If
       Return False
    End Function
@@ -396,6 +449,7 @@ 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,6 +109,34 @@
                                    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"
@@ -266,6 +294,43 @@
             </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}" 
@@ -304,6 +369,43 @@
             </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}" 
@@ -342,6 +444,53 @@
             </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}" 
@@ -422,7 +571,7 @@
                                         Style="{DynamicResource StringParamV_Margin}"/>
             </StackPanel>
          </Expander>
-
+      
          <Interactivity:Interaction.Behaviors>
             <EgtCAM5:AutomaticCloseExpander/>
          </Interactivity:Interaction.Behaviors>

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/FiveAxisMachinigParameterExpanderV.xaml

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

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

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

@@ -1,10 +1,10 @@
 <UserControl x:Class="MachiningParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             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:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
       <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -73,26 +73,38 @@
       <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
       <sys:Int32 x:Key="TabMax">62</sys:Int32>
       <sys:Int32 x:Key="TabMin">63</sys:Int32>
-    </UserControl.Resources>
+   </UserControl.Resources>
 
-    <StackPanel>
+   <StackPanel>
-        <ContentControl Content="{Binding Path=ParamExpanderPageV}" />
+      <ContentControl Content="{Binding Path=ParamExpanderPageV}" />
 
-        <Button Name="ApplyMachBtn" Height="30" Content="{Binding UpdateMachiningBtnMsg}"
+      <Button Name="ApplyMachBtn" Height="30" Content="{Binding UpdateMachiningBtnMsg}"
-             Command="{Binding UpdateMachiningCommand}" Background="{Binding UpdateMachiningBtn_Background}"/>
+              Command="{Binding UpdateMachiningCommand}" Background="{Binding UpdateMachiningBtn_Background}"/>
-        <Grid>
+      <Grid>
-            <Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
-                <ColumnDefinition Width="2*"/>
+            <RowDefinition Height="1*"/>
-                <ColumnDefinition Width="1*"/>
+            <RowDefinition Height="Auto"/>
-                <ColumnDefinition Width="1*"/>
+         </Grid.RowDefinitions>
-            </Grid.ColumnDefinitions>
+         <Grid.ColumnDefinitions>
-            <ToggleButton Name="ViewToolBtn" Grid.Column="0" Height="30" Content="{Binding ViewToolBtnMsg}"
+            <ColumnDefinition Width="1*"/>
-                IsChecked="{Binding ViewTool}" />
+         </Grid.ColumnDefinitions>
-            <Button Name="NextStepToolBtn" Grid.Column="1" Height="30" Content="{Binding NextStepToolBtnMsg}"
+
-                Command="{Binding NextStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
+         <CheckBox Name="ViewToolBtn"
-            <Button Name="PrevStepToolBtn" Grid.Column="2" Height="30" Content="{Binding PrevStepToolBtnMsg}"
+                   Content="{Binding ViewToolBtnMsg}"
-                Command="{Binding PrevStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
+                   IsChecked="{Binding ViewTool}"
-        </Grid>
+                   Style="{StaticResource ViewTool_CheckBox}"/>
-    </StackPanel>
+
+         <Slider Grid.Row="1" 
+                 x:Name="SliderV"
+                 Value="{Binding SliderValue}"
+                 IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"
+                 TickFrequency="{Binding SliderTick}"
+                 Minimum="1"
+                 Maximum="{Binding SliderScale}"
+                 IsSnapToTickEnabled="False"
+                 Style="{StaticResource SliderValue_Slider}"/>
+
+      </Grid>
+   </StackPanel>
 
 </UserControl>

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

@@ -3,81 +3,22 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class MachiningParameterExpanderV
 
-   'Private EgtFloatingTray As EgtFloatingTray
+   Sub New()
-   'Private EgtFloatingPanel As EgtFloatingPanel
 
-   'Private m_bFirst As Boolean = True
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
 
-   'Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
-   '   If m_bFirst Then
-   '      EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
-   '      EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-   '      AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
-   '      PanelHeight = EgtFloatingPanel.ActualHeight
-   '      Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
-   '      m_bFirst = False
-   '   End If
-   '   CalculateOperationParametersStackPanelMaxHeight()
-   'End Sub
 
-   'Dim m_bSizeChanging As Boolean = False
+      ' Associo il gestore evento m_EventFocusOnSlider all'evento generato da FocusOnSlider
+      AddHandler Map.refMachiningParameterExpanderVM.m_EventFocusOnSlider, AddressOf FocusOnSlider
+   End Sub
 
-   'Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   ''' <summary>
-   '   If m_bSizeChanging Then Return
+   ''' Funzione che mette il focus allo slider
-   '   m_bSizeChanging = True
+   ''' </summary>
-   '   CalculateOperationParametersStackPanelMaxHeight()
+   Friend Sub FocusOnSlider()
-   '   m_bSizeChanging = False
+      Me.SliderV.Focus()
-   'End Sub
+   End Sub
-
-   'Dim PanelHeight As Double = 0
-   'Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
-
-   'Private Sub CalculateOperationParametersStackPanelMaxHeight()
-   '   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
-   '   Dim OpenedExpanderList As New List(Of Boolean)
-   '   For Index = 0 To AutomaticCloseExpanderStackPanel.Children.Count - 1
-   '      If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
-   '         Dim IndexedExpander As Expander = DirectCast(AutomaticCloseExpanderStackPanel.Children(Index), Expander)
-   '         If IndexedExpander.IsExpanded Then
-   '            OpenedExpanderList.Add(True)
-   '            IndexedExpander.IsExpanded = False
-   '            Dim CurrExpanderContent As FrameworkElement = DirectCast(IndexedExpander.Content, FrameworkElement)
-   '            CurrExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
-   '            AutomaticCloseExpanderStackPanelHeight -= CurrExpanderContent.DesiredSize.Height
-   '            ' Sottraggo anche i padding
-   '            AutomaticCloseExpanderStackPanelHeight -= (IndexedExpander.Padding.Top + IndexedExpander.Padding.Bottom)
-   '         Else
-   '            OpenedExpanderList.Add(False)
-   '         End If
-   '      Else
-   '         OpenedExpanderList.Add(False)
-   '      End If
-   '   Next
-   '   Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
-   '   AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
-   '   For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
-   '      If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
-   '         Dim IndexedExpander As Expander = DirectCast(AutomaticCloseExpanderStackPanel.Children(Index), Expander)
-   '         If OpenedExpanderList(Index) Then
-   '            IndexedExpander.IsExpanded = True
-   '         End If
-   '      End If
-   '   Next
-   'End Sub
-
-   '' Funzione che permette di trovare il primo contenitore di tipo T di un elemento grafico dependencyObject 
-   'Public Function FindAncestor(Of T As Class)(dependencyObject As DependencyObject) As T
-   '   Dim target As DependencyObject = dependencyObject
-   '   Do
-   '      target = LogicalTreeHelper.GetParent(target)
-   '   Loop While target IsNot Nothing AndAlso Not (TypeOf target Is T)
-   '   If IsNothing(target) Then
-   '      target = dependencyObject
-   '      Do
-   '         target = VisualTreeHelper.GetParent(target)
-   '      Loop While target IsNot Nothing AndAlso Not (TypeOf target Is T)
-   '   End If
-   '   Return TryCast(target, T)
-   'End Function
 
 End Class

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb

@@ -6,6 +6,11 @@ Imports EgtWPFLib5
 Public Class MachiningParameterExpanderVM
    Inherits VMBase
 
+   ''' <summary>
+   ''' Evento che permette di mettere il focus sullo slider
+   ''' </summary>
+   Friend Event m_EventFocusOnSlider()
+
    Private WithEvents m_CurrOperation As MachiningTreeViewItem
    Public Property CurrOperation As MachiningTreeViewItem
       Get
@@ -50,7 +55,6 @@ Public Class MachiningParameterExpanderVM
    End Property
 
    Private m_bPreviewTool As Boolean = False
-   Private m_nPtEntId As Integer = GDB_ID.NULL
    Public Property ViewTool As Boolean
       Get
          Return m_bPreviewTool
@@ -58,16 +62,80 @@ Public Class MachiningParameterExpanderVM
       Set(value As Boolean)
          If value Then
             EgtPreparePreviewMachiningTool()
-            m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
             m_bPreviewTool = True
+            ResetSliderValue()
          Else
             EgtRemovePreviewMachiningTool()
             m_bPreviewTool = False
+            ResetSliderValue()
          End If
          EgtDraw()
-         NotifyPropertyChanged("ViewTool")
       End Set
    End Property
+   Friend Sub SetViewTool(value As Boolean)
+      ViewTool = value
+      NotifyPropertyChanged("ViewTool")
+   End Sub
+
+   ' Slider per muovere l'utensile in aggiunta ai pulsanti indietro e avanti
+   Private m_SliderScale As Integer = 100
+   Public ReadOnly Property SliderScale As Integer
+      Get
+         Return m_SliderScale
+      End Get
+   End Property
+   Friend Sub SetSliderScale(value As Integer)
+      m_SliderScale = Math.Max( value, 1)
+      If m_SliderScale <= 10 Then
+         m_SliderTick = 1
+      Else
+         m_SliderTick = CInt( m_SliderScale / 10)
+      End If
+      NotifyPropertyChanged( NameOf(SliderScale))
+      NotifyPropertyChanged( NameOf(SliderTick))
+   End Sub 
+
+   Private m_SliderTick As Integer = 10
+   Public ReadOnly Property SliderTick As Integer
+      Get
+         Return m_SliderTick
+      End Get
+   End Property
+
+   Private m_nPtEntId As Integer = GDB_ID.NULL
+   Private m_SliderValue As Integer = 1
+   Public Property SliderValue As Integer
+      Get
+         Return m_SliderValue
+      End Get
+      Set(value As Integer)
+         If m_bPreviewTool Then
+            Dim nId As Integer = EgtPreviewMachiningTool(m_nPtEntId, value - m_SliderValue)
+            If nId <> GDB_ID.NULL Then m_nPtEntId = nId
+            EgtDraw()
+         End If
+         m_SliderValue = value
+      End Set
+   End Property
+   Friend Sub ResetSliderValue()
+      If m_bPreviewTool Then
+         m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
+      Else
+         m_nPtEntId = GDB_ID.NULL
+      End If
+      m_SliderValue = 1
+      NotifyPropertyChanged(NameOf(SliderValue))
+   End Sub
+   Friend Sub SetSliderValue(value As Integer)
+      Dim nOldSliderValue As Integer = m_SliderValue
+      m_SliderValue = Math.Min( Math.Max( m_SliderValue + value, 1), m_SliderScale)
+      Dim nStep As Integer = m_SliderValue - nOldSliderValue
+      If nStep = 0 Then Return
+      Dim nId As Integer = EgtPreviewMachiningTool(m_nPtEntId, nStep)
+      If nId <> GDB_ID.NULL Then m_nPtEntId = nId
+      EgtDraw()
+      NotifyPropertyChanged(NameOf(SliderValue))
+   End Sub
 
    Dim WoodDrillParamExpanderV As WoodDrillingParameterExpanderV
    Dim WoodSawParamExpanderV As WoodSawingParameterExpanderV
@@ -84,6 +152,8 @@ Public Class MachiningParameterExpanderVM
    Dim StoneDrillParamExpanderV As StoneDrillingParameterExpanderV
    Dim SurfFinishParamExpanderV As SurfFinishingParameterExpanderV
    Dim WjParamExpanderV As WaterjettingParameterExpanderV
+   Dim FiveAxExpanderV As FiveAxisMachinigParameterExpanderV
+   Dim SurfRoughExpanderV As SurfRoughingParameterExpanderV
 
    Private Sub Dummy()
 
@@ -106,24 +176,11 @@ Public Class MachiningParameterExpanderVM
          EgtGetMachiningParam(MCH_MP.TYPE, nType)
          m_CurrOperation = New MachiningTreeViewItem(sName, DirectCast(nType, MCH_MY))
 
-         'WoodDrillParamExpanderV.DataContext = Nothing
-         'WoodSawParamExpanderV.DataContext = Nothing
-         'WoodMillParamExpanderV.DataContext = Nothing
-         'BeamMillParamExpanderV.DataContext = Nothing
-         'PocketParamExpanderV.DataContext = Nothing
-         'MortiseParamExpanderV.DataContext = Nothing
-         'GenMachinParamExpanderV.DataContext = Nothing
-         'ChiselParamExpanderV.DataContext = Nothing
-         'StoneSawParamExpanderV.DataContext = Nothing
-         'StoneSawFinishParamExpanderV.DataContext = Nothing
-         'StoneSawRoughParamExpanderV.DataContext = Nothing
-         'StoneMillParamExpanderV.DataContext = Nothing
-         'StoneDrillParamExpanderV.DataContext = Nothing
-         'SurfFinishParamExpanderV.DataContext = Nothing
-         'WjParamExpanderV.DataContext = Nothing
-
          m_CurrOperation.ReadOperationParam()
 
+         ' Riferimento a operazione selezionata 
+         EgtWPFLib5.MachiningTreeViewItem.sh_SelMach = m_CurrOperation
+
          IsModified(False)
          ErrorOnOperation(False)
 
@@ -212,6 +269,14 @@ Public Class MachiningParameterExpanderVM
                If IsNothing(WjParamExpanderV) Then WjParamExpanderV = New WaterjettingParameterExpanderV
                WjParamExpanderV.DataContext = m_CurrOperation
                Return WjParamExpanderV
+            Case MCH_OY.FIVEAXISMILLING
+               If IsNothing(FiveAxExpanderV) Then FiveAxExpanderV = New FiveAxisMachinigParameterExpanderV
+               FiveAxExpanderV.DataContext = m_CurrOperation
+               Return FiveAxExpanderV
+            Case MCH_OY.SURFROUGHING
+               If IsNothing(SurfRoughExpanderV) Then SurfRoughExpanderV = New SurfRoughingParameterExpanderV
+               SurfRoughExpanderV.DataContext = m_CurrOperation
+               Return SurfRoughExpanderV
          End Select
 
          'MachiningParameterExpanderItem.ReadOperationParam()
@@ -257,84 +322,25 @@ Public Class MachiningParameterExpanderVM
 
    Sub New()
       EgtWPFLib5.MachiningDbWindowVM.m_sMachineIniPath = IniFile.m_sCurrMachIniFilePath
-
+      Map.SetRefMachiningParameterExpanderVM(Me)
-      'WoodDrillParamExpanderV = New WoodDrillingParameterExpanderV
-      'WoodSawParamExpanderV = New WoodSawingParameterExpanderV
-      'WoodMillParamExpanderV = New WoodMillingParameterExpanderV
-      'BeamMillParamExpanderV = New BeamMillingParameterExpanderV
-      'PocketParamExpanderV = New PocketingParameterExpanderV
-      'MortiseParamExpanderV = New MortisingParameterExpanderV
-      'GenMachinParamExpanderV = New GenMachiningParameterExpanderV
-      'ChiselParamExpanderV = New ChiselingParameterExpanderV
-      'StoneSawParamExpanderV = New StoneSawingParameterExpanderV
-      'StoneSawFinishParamExpanderV = New StoneSawFinishingParameterExpanderV
-      'StoneSawRoughParamExpanderV = New StoneSawRoughingParameterExpanderV
-      'StoneMillParamExpanderV = New StoneMillingParameterExpanderV
-      'StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
-      'SurfFinishParamExpanderV = New SurfFinishingParameterExpanderV
-      'WjParamExpanderV = New WaterjettingParameterExpanderV
-
       NotifyPropertyChanged("ParamExpanderPageV")
    End Sub
 
 #End Region    ' Constructor
 
+#Region "METHODS"
+
+   ''' <summary>
+   ''' Funzione che attiva l'evento che mette il focus sullo slider
+   ''' </summary>
+   Public Sub FocusSlider()
+      RaiseEvent m_EventFocusOnSlider()
+   End Sub
+
+#End Region    ' Methods
+
 #Region "COMMANDS"
 
-#Region "NextStepToolCommand"
-
-   ''' <summary>
-   ''' Restituisce funzione per ricalcolo lavorazione.
-   ''' </summary>
-   Public ReadOnly Property NextStepToolCommand As ICommand
-      Get
-         If m_cmdNextStepTool Is Nothing Then
-            m_cmdNextStepTool = New RelayCommand(AddressOf NextStepTool)
-         End If
-         Return m_cmdNextStepTool
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Ricalcola una lavorazione.
-   ''' </summary>
-   Public Sub NextStepTool(ByVal param As Object)
-      If m_bPreviewTool Then
-         Dim nNextId = EgtPreviewMachiningTool(m_nPtEntId, MCH_PTM.AFTER)
-         If nNextId <> GDB_ID.NULL Then m_nPtEntId = nNextId
-         EgtDraw()
-      End If
-   End Sub
-
-#End Region    ' NextStepToolCommand
-
-#Region "PrevStepToolCommand"
-
-   ''' <summary>
-   ''' Restituisce funzione per ricalcolo lavorazione.
-   ''' </summary>
-   Public ReadOnly Property PrevStepToolCommand As ICommand
-      Get
-         If m_cmdPrevStepTool Is Nothing Then
-            m_cmdPrevStepTool = New RelayCommand(AddressOf PrevStepTool)
-         End If
-         Return m_cmdPrevStepTool
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Ricalcola una lavorazione.
-   ''' </summary>
-   Public Sub PrevStepTool(ByVal param As Object)
-      If m_bPreviewTool Then
-         Dim nPrevId = EgtPreviewMachiningTool(m_nPtEntId, MCH_PTM.BEFORE)
-         If nPrevId <> GDB_ID.NULL Then m_nPtEntId = nPrevId
-         EgtDraw()
-      End If
-   End Sub
-
-#End Region    ' PrevStepToolCommand
-
 #Region "UpdateMachiningCommand"
 
    ''' <summary>
@@ -364,7 +370,18 @@ Public Class MachiningParameterExpanderVM
          MessageBox.Show(EgtMsg(5423) + sErrorList, EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Return
       End If
-      Dim bRecalc As Boolean = ((Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift)
+
+      Dim bRecalc As Boolean = False
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         bRecalc = True
+      Else
+         ' Controllo se il tipo e' dr o sr o lr bRecalc e' true come quando viene selezionato Shift
+         For Each ItemNote As NoteListBoxItem In m_CurrOperation.NotesList
+            bRecalc = ItemNote.Type.Equals("dr") OrElse ItemNote.Type.Equals("lr") OrElse ItemNote.Type.Equals("sr") OrElse ItemNote.Type.Equals("br")
+            If bRecalc Then Exit For
+         Next
+      End If
+
       ' La modifica di alcuni parametri forza il ricalcolo della geometria
       Dim ModifiedGeometry As Boolean = m_CurrOperation.m_IsModifiedSelectedFaceUseType
       ' aggiorno valori modificati
@@ -443,11 +460,9 @@ Public Class MachiningParameterExpanderVM
          End If
       End If
       ' Restart visualizzazione utensile
-      If m_bPreviewTool Then
+      SetSliderScale( EgtGetPreviewMachiningToolStepCount())
-         EgtPreparePreviewMachiningTool()
+      SetViewTool(True)
-         m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
+      IsModified(False)
-      End If
-      IsModified(False) ' NotifyPropertyChanged("UpdateMachiningBtn_Background")
       ErrorOnOperation(False)
       EgtDraw()
       Map.refProjectVM.EmitTitle()
@@ -503,8 +518,12 @@ Public Class OperationParamVisibilityConverter
             Return TMDbParamVisibility.Chiseling(CInt(parameter))
          Case MCH_OY.SURFFINISHING
             Return TMDbParamVisibility.SurfFinishing(CInt(parameter))
+         Case MCH_OY.SURFROUGHING
+            Return TMDbParamVisibility.SurfRoughing(CInt(parameter))
          Case MCH_OY.WATERJETTING
             Return TMDbParamVisibility.WaterJetting(CInt(parameter))
+         Case MCH_OY.FIVEAXISMILLING
+            Return TMDbParamVisibility.FiveAxMachining(CInt(parameter))
          Case Else
             Return Visibility.Hidden
       End Select

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml

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

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

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

OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb

@@ -170,6 +170,8 @@ Public Class MachiningOpListBoxItem
             Return ""
          Case MCH_OY.CHISELING
             Return ""
+         Case MCH_OY.FIVEAXISMILLING
+            Return ""
          Case Else
             Return String.Empty
       End Select

OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb

@@ -106,26 +106,32 @@ Public Class OperationListBoxItem
                Dim EntityIndex As Integer = 0
                Dim SubEntityIndex As Integer = 0
                While EgtGetMachiningGeometry(CountIndex, EntityIndex, SubEntityIndex)
-                  EgtSelectObj( EntityIndex)
+                  EgtSelectObj(EntityIndex)
-                  If EgtGetType( EntityIndex) = GDB_TY.SRF_MESH Or EgtGetType( EntityIndex) = GDB_TY.SRF_FRGN Then
+                  If EgtGetType(EntityIndex) = GDB_TY.SRF_MESH Or EgtGetType(EntityIndex) = GDB_TY.SRF_FRGN Then
                      SelData.AddIdSub(EntityIndex, SubEntityIndex)
                   End If
                   CountIndex += 1
                End While
             End If
             ' Notifico al contentcontrol OperationParameter di aggiornarsi
-            If Not IsNothing( Map.refOperationParametersExpanderVM) Then
+            If Not IsNothing(Map.refOperationParametersExpanderVM) Then
                Map.refOperationParametersExpanderVM.OnPropertyChanged("OperationParameters")
             End If
             Map.refOperationsListExpanderVM.OnPropertyChanged("MoveUp_IsEnabled")
             Map.refOperationsListExpanderVM.OnPropertyChanged("MoveDown_IsEnabled")
             ' Notifico l'operazione selezionata all'expander con l'albero delle lavorazioni aggiungibili
-            If Not IsNothing( Map.refMachiningTreeExpanderVM) Then
+            If Not IsNothing(Map.refMachiningTreeExpanderVM) Then
                Map.refMachiningTreeExpanderVM.nSelectedOperationId = Me.Id
             End If
             ' Aggiorno visualizzazione
             EgtDraw()
          End If
+         ' Resetto valori slider
+         If Not IsNothing(Map.refMachiningParameterExpanderVM) Then
+            Map.refMachiningParameterExpanderVM.SetSliderScale(EgtGetPreviewMachiningToolStepCount())
+            Map.refMachiningParameterExpanderVM.ResetSliderValue()
+         End If
+
          'OnPropertyChanged("ToolExpanderHeader")
          Map.refOperationsListExpanderVM.OnPropertyChanged("DuplicateCmd_IsEnabled")
          Map.refOperationsListExpanderVM.OnPropertyChanged("MachToDb_IsEnabled")

OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb

@@ -70,9 +70,10 @@ Public Class OperationParametersExpanderVM
             Return m_DispositionParameterExpander
          Else
             If IsNothing(m_MachiningParameterExpander) Then
-               m_MachiningParameterExpander = New MachiningParameterExpanderV
                m_MachiningParameterExpanderVM = New MachiningParameterExpanderVM()
-               m_MachiningParameterExpander.DataContext = m_MachiningParameterExpanderVM
+               m_MachiningParameterExpander = New MachiningParameterExpanderV With {
+                  .DataContext = m_MachiningParameterExpanderVM
+               }
             End If
             m_MachiningParameterExpanderVM.NotifyPropertyChanged("ParamExpanderPageV")
             Return m_MachiningParameterExpander
@@ -170,11 +171,15 @@ Public Class OperationParametersExpanderVM
                Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomChiseling
             Case MCH_OY.SURFFINISHING
                Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomSurfFinishing
+            Case MCH_OY.SURFROUGHING
+               Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomSurfRoughing
             Case MCH_OY.WATERJETTING
                Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomWaterJetting
+            Case MCH_OY.FIVEAXISMILLING
+               Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomFiveAxMilling
          End Select
          ' Imposto visualizzazione utensile
-         DirectCast(m_MachiningParameterExpander.DataContext, MachiningParameterExpanderVM).ViewTool = True
+         Map.refMachiningParameterExpanderVM.SetViewTool( True)
       End If
       OnPropertyChanged("ParametersIsExpanded")
       Return True
@@ -204,7 +209,7 @@ Public Class OperationParametersExpanderVM
          EgtDraw()
       Else
          ' Nascondo visualizzazione utensile
-         DirectCast(m_MachiningParameterExpander.DataContext, MachiningParameterExpanderVM).ViewTool = False
+         Map.refMachiningParameterExpanderVM.SetViewTool( False)
       End If
       ParametersExpanderName = String.Empty
       ' Disabilito la selezione delle lavorazioni

OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb

@@ -329,10 +329,11 @@ Public Class OperationsListExpanderVM
       ' Aggiungo la nuova fase
       Dim nPhase As Integer = EgtAddPhase()
       Dim nDispId As Integer = EgtGetPhaseDisposition(nPhase)
-      ' Confermo grezzi e bloccaggi sopra salvati
+      ' Confermo grezzi, movimenti assi di disposizione 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
@@ -433,6 +434,10 @@ 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
 
@@ -829,6 +834,7 @@ Public Class OperationsListExpanderVM
                                        MCH_MP.OFFSET,
                                        MCH_MP.STEPEXTARC,
                                        MCH_MP.STEPINTARC,
+                                       MCH_MP.SUBSTEP,
                                        MCH_MP.SIDESTEP,
                                        MCH_MP.VERTFEED,
                                        MCH_MP.STEPSIDEANG,
@@ -1250,7 +1256,7 @@ Public Class OperationsListExpanderVM
       If m_NewMachining Then EndNewMachining(GDB_ID.NULL)
       ' Disabilito visualizzazione utensile
       If Not IsNothing(m_MachiningParameterExpander) Then
-         DirectCast(m_MachiningParameterExpander.DataContext, MachiningParameterExpanderVM).ViewTool = False
+         Map.refMachiningParameterExpanderVM.SetViewTool( False)
       End If
       ' Deseleziono le operazioni correnti per eliminare il mark
       For Each Operation In OperationList

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb

@@ -33,6 +33,17 @@ Public Class SimulationExpanderVM
       End Set
    End Property
 
+   Private m_bOnlySimulation As Boolean = False
+   Public Property bOnlySimulation As Boolean
+      Get
+         Return m_bOnlySimulation
+      End Get
+      Set(value As Boolean)
+         m_bOnlySimulation = value
+         NotifyPropertyChanged("bOnlySimulation")
+      End Set
+   End Property
+
    Public Overrides Property SliderValue As Double
       Get
          Return m_SliderValue
@@ -90,9 +101,11 @@ Public Class SimulationExpanderVM
       If Not GetCncFileName(True, sCncFile, sInfo) Then Return
       ' Eseguo
       If Not EgtGenerate(sCncFile, sInfo) Then
-         Dim nErr = EgtGetLastMachMgrErrorId()
+         Dim nErr As Integer = EgtGetLastMachMgrErrorId()
          If nErr = 1000 Then
             MessageBox.Show(EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+         ElseIf nErr = 1001 Then
+            MessageBox.Show(EgtMsg(5334), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
          ElseIf nErr <> 0 Then
             Dim sErr As String = EgtGetLastMachMgrErrorString()
             MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)
@@ -151,6 +164,14 @@ Public Class SimulationExpanderVM
       ' disattivo MTable e SpecialPanel se vado in simulazione
       Map.refDoorPanelVM.MTableIsEnabled(False)
       Map.refSpecialPanelVM.SpecialPanelIsEnabled(False)
+      If m_bOnlySimulation Then
+         Map.refTopCommandBarVM.DrawIsEnabled = False
+         Map.refOperationsListExpanderVM.OpersListViewIsEnabled = False
+         Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = False
+         Map.refEstimationsExpanderVM.Estimation_IsEnabled =False
+         Map.refMachGroupPanelVM.SetMachGroupState(False)
+         Map.refEstimationsExpanderVM.NotifyPropertyChanged("Estimation_IsEnabled")
+      End If
       Return True
    End Function
 
@@ -206,11 +227,16 @@ Public Class SimulationExpanderVM
       UpdateUI()
       ' Messaggio in caso di errore
       If Not bOk Then
-         If EgtGetLastMachMgrErrorId() <> 0 Then
+         Dim nErr As Integer = EgtGetLastMachMgrErrorId()
+         If nErr = 1000 Then
+            MessageBox.Show(EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+         ElseIf nErr = 1001 Then
+            MessageBox.Show(EgtMsg(5334), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+         ElseIf nErr <> 0 Then
             Dim sErr As String = EgtGetLastMachMgrErrorString()
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
+            MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
          Else
-            MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
+            MessageBox.Show(EgtMsg(15010), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
          End If
       End If
       ' Imposto stato corrente
@@ -244,15 +270,20 @@ Public Class SimulationExpanderVM
       Map.refTopCommandBarVM.DrawIsEnabled = False
       Map.refOperationsListExpanderVM.OpersListViewIsEnabled = False
       Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = False
-      Map.refMachGroupPanelVM.SetMachGroupState(False) ' Map.refMachGroupPanelVM.MachGroupPanelIsEnabled = False
+      Map.refMachGroupPanelVM.SetMachGroupState(False)
       Map.refEstimationsExpanderVM.NotifyPropertyChanged("Estimation_IsEnabled")
       m_bStopOnNextCollision = True
       If Not EgtSimStart(False) Then
-         If EgtGetLastMachMgrErrorId() <> 0 Then
+         Dim nErr As Integer = EgtGetLastMachMgrErrorId()
+         If nErr = 1000 Then
+            MessageBox.Show(EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+         ElseIf nErr = 1001 Then
+            MessageBox.Show(EgtMsg(5334), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information)
+         ElseIf nErr <> 0 Then
             Dim sErr As String = EgtGetLastMachMgrErrorString()
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
+            MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
          Else
-            MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
+            MessageBox.Show(EgtMsg(15010), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
          End If
          SetSimulationStatus(MCH_SIM_ST.UI_STOP)
       End If
@@ -337,10 +368,15 @@ Public Class SimulationExpanderVM
       End While
       SetSimExecuting(False)
       IniFile.m_bSimulExecuting = False
-      Map.refTopCommandBarVM.DrawIsEnabled = True
+      If m_bOnlySimulation Then
-      Map.refOperationsListExpanderVM.OpersListViewIsEnabled = True
+         ' Impedisco salvataggio eventuale modifica stato virtual milling
-      Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = True
+         EgtResetModified()
-      Map.refMachGroupPanelVM.SetMachGroupState(True) ' Map.refMachGroupPanelVM.MachGroupPanelIsEnabled = True
+      Else
+         Map.refTopCommandBarVM.DrawIsEnabled = True
+         Map.refOperationsListExpanderVM.OpersListViewIsEnabled = True
+         Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = True
+         Map.refMachGroupPanelVM.SetMachGroupState(True)
+      End If
       Map.refEstimationsExpanderVM.NotifyPropertyChanged("Estimation_IsEnabled")
       If IniFile.m_bSimulEndExitApp Then
          refMainWindowVM.CloseApplication( Nothing)

OptionPanel/MachiningOptionPanelV.xaml

@@ -1,8 +1,7 @@
 <UserControl x:Class="MachiningOptionPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
 
    <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <!--ContentPresenter that contains the OperationsListExpander-->

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" Width="250"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               TitleBarOrientation="Vertical"
                               Visibility="{Binding Panel_Visibility}">

OptionsWindow/OptionModule.vb

@@ -53,7 +53,10 @@ Friend Module OptionModule
    Friend m_SelGeomGenMachining As SceneSelModeOpt
    Friend m_SelGeomChiseling As SceneSelModeOpt
    Friend m_SelGeomSurfFinishing As SceneSelModeOpt
+   Friend m_SelGeomSurfRoughing As SceneSelModeOpt
    Friend m_SelGeomWaterJetting As SceneSelModeOpt
+   Friend m_SelGeomFiveAxMilling As SceneSelModeOpt
+   Friend m_SelVMillQuality As VMillSelTypeOpt
    ' Flag per aggiungere una nuova lavorazione alla fine della fase o subito dopo la lavorazione selezionata
    Friend m_bNewMachiningIsLastOne As Boolean
    ' Variabile che indica se usare lo script per calcolare automaticamente la disposizione quando si passa in lavorazione
@@ -78,7 +81,7 @@ Friend Module OptionModule
       End While
       If nIndex = 1 Then
          EgtOutLog("Error missing languages section in Config.ini")
-         MessageBox.Show( "Error : missing languages informations", "EgtCAM5", MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show("Error : missing languages informations", "EgtCAM5", MessageBoxButton.OK, MessageBoxImage.Error)
          End
       End If
       ' Inizializzo la lingua corrente
@@ -102,9 +105,9 @@ Friend Module OptionModule
       GetPrivateProfileColor(S_GRID, K_MINLNCOLOR, GridColor)
       m_GridColor = GridColor
       ' Inizializzo flag linee ingrossate
-      m_bThickLine = ( GetPrivateProfileInt(S_SCENE, K_LINEWIDTH, 1) <> 1)
+      m_bThickLine = (GetPrivateProfileInt(S_SCENE, K_LINEWIDTH, 1) <> 1)
       ' Inizializzo flag visualizzazione smussata delle superfici
-      m_bSmoothTriMesh = ( GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
+      m_bSmoothTriMesh = (GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
       ' Inizio colore di default in disegno
       Dim DefColor As New Color3d(0, 0, 0)
       GetPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
@@ -141,6 +144,12 @@ Friend Module OptionModule
       m_SelGeomChiseling = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
       Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMSURFFINISHING, -1)
       m_SelGeomSurfFinishing = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
+      Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMSURFROUGHING, -1)
+      m_SelGeomSurfRoughing = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
+      Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMFIVEAXMILLING, -1)
+      m_SelGeomFiveAxMilling = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
+      Temp = GetPrivateProfileInt(S_MACH, K_SELVMILLQUALITY, 0)
+      m_SelVMillQuality = If(Temp < -2 Or Temp > 2, VMillSelTypeOpt.HIGHER, DirectCast(Temp, VMillSelTypeOpt))
       m_SelGeomWaterJetting = SceneSelModeOpt.PARTCURVES
       ' Inizializzo variabile che indica posizione nuova operazione di lavorazione
       m_bNewMachiningIsLastOne = (GetPrivateProfileInt(S_OPTIONS, K_NEWMACHININGISLASTONE, 0) <> 0)

OptionsWindow/OptionWindowV.xaml

@@ -1,21 +1,22 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="OptionWindowV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            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:local="clr-namespace:EgtCAM5"
+                            xmlns:local="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+                            Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-   IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-   MinWidth="400" MinHeight="382"
+                            MinWidth="400" MinHeight="382"
-   Width="400" Height="412"
+                            Width="400" Height="575"
-   CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+                            CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-   
+
    <EgtWPFLib5:EgtCustomWindow.Resources>
       <local:GeomTypeConverter x:Key="GeomTypeConverter"/>
+      <local:VMillTypeConverter x:Key="VMillTypeConverter"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>
-   
+
    <TabControl Margin="5,5,5,5">
       <TabItem Header="{Binding GenericMsg}">
          <StackPanel Margin="5,5,5,0">
@@ -25,8 +26,9 @@
                   <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
                             DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
                             Margin="0,0,0,5"/>
-                  <TextBlock Text="{Binding LanguageAdvertMsg}" TextWrapping="Wrap"
+                  <TextBlock Text="{Binding LanguageAdvertMsg}" 
-                  TextAlignment="Center"/>
+                             TextWrapping="Wrap"
+                             TextAlignment="Center"/>
                </UniformGrid>
             </GroupBox>
             <UniformGrid Columns="2"
@@ -69,11 +71,11 @@
                           Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
             </Grid>
             <UniformGrid Columns="2"
-                     Margin="0,0,0,5">
+                         Margin="0,0,0,5">
-                <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
+               <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
-                <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
+               <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedTextFont}" Height="25"
+                         SelectedItem="{Binding SelectedTextFont}" Height="25"
-                            Margin="10,5,0,0"/>
+                         Margin="10,5,0,0"/>
             </UniformGrid>
             <Grid Margin="5,5,5,5">
                <Button Content="{Binding UpdateLicenceMsg}" Command="{Binding UpdateLicence_Command}"  Height="26" Margin="100,1"/>
@@ -96,99 +98,97 @@
                         VerticalContentAlignment="Center"
                         Margin="10,0,0,0"/>
             </UniformGrid>
-                <GroupBox Grid.Column="1" Grid.RowSpan="2"
+            <GroupBox Grid.Column="1" Grid.RowSpan="2"
                       Header="{Binding DimensionMsg}"
                       Margin="0,0,0,5">
-                    <UniformGrid Grid.ColumnSpan="2" Columns="2">
+               <UniformGrid Grid.ColumnSpan="2" Columns="2">
-                        <TextBlock Text="{Binding ExtLineLenMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding ExtLineLenMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding ExtLineLen}" Height="25"
+                  <TextBox Text="{Binding ExtLineLen}" Height="25"
-                                 VerticalContentAlignment="Center"
+                           VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
+                           Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding ArrowLenMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding ArrowLenMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding ArrowLen}" Height="25"
+                  <TextBox Text="{Binding ArrowLen}" Height="25"
-                                 VerticalContentAlignment="Center"
+                           VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
+                           Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding TextDistMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding TextDistMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding TextDist}" Height="25"
+                  <TextBox Text="{Binding TextDist}" Height="25"
-                                 VerticalContentAlignment="Center"
+                           VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
+                           Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding LenIsMMMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding LenIsMMMsg}" VerticalAlignment="Center"/>
-                        <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
+                  <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                                 SelectedItem="{Binding SelectedUnitMeasure}" Height="25"
+                            SelectedItem="{Binding SelectedUnitMeasure}" Height="25"
-                                 Margin="10,5,0,0"/>
+                            Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding DecDigitMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding DecDigitMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding DecDigit}" Height="25"
+                  <TextBox Text="{Binding DecDigit}" Height="25"
-                                 VerticalContentAlignment="Center"
+                           VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
+                           Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
-                        <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
+                  <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
-                                 SelectedItem="{Binding SelectedFont}" Height="25"
+                            SelectedItem="{Binding SelectedFont}" Height="25"
-                                 Margin="10,5,0,0"/>
+                            Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding TextHeightMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding TextHeightMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding TextHeight}" Height="25"
+                  <TextBox Text="{Binding TextHeight}" Height="25"
-                                 VerticalContentAlignment="Center"
+                           VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
+                           Margin="10,5,0,0"/>
-                    </UniformGrid>
+               </UniformGrid>
-                </GroupBox>
+            </GroupBox>
-            </StackPanel>
+         </StackPanel>
-          
       </TabItem>
       <TabItem Header="{Binding ImportMsg}">
          <StackPanel Margin="5,5,5,0">
-                <Grid Margin="0,5,0,0">
+            <Grid Margin="0,5,0,0">
-                    <Grid.ColumnDefinitions>
+               <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="0.8*"/>
+                  <ColumnDefinition Width="0.8*"/>
-                        <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
+               </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
+               <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
-                    </Grid.RowDefinitions>
+               </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" Grid.Column="1" 
+               <TextBlock Grid.Row="0" Grid.Column="1" 
-                             VerticalAlignment="Center" HorizontalAlignment="Center"  
+                          VerticalAlignment="Center" HorizontalAlignment="Center"  
-                             Text="{Binding UnitScaleMsg}" />
+                          Text="{Binding UnitScaleMsg}" />
-                    <TextBlock Grid.Row="0" Grid.Column="2" 
+               <TextBlock Grid.Row="0" Grid.Column="2" 
-                             VerticalAlignment="Center" HorizontalAlignment="Center"  
+                          VerticalAlignment="Center" HorizontalAlignment="Center"  
-                             Text="{Binding FactorScaleMsg}"/>
+                          Text="{Binding FactorScaleMsg}"/>
-                    
+               <TextBlock Grid.Row="1" Grid.Column="0" 
-                    <TextBlock Grid.Row="1" Grid.Column="0" 
+                          Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
-                             Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
+               <ComboBox Grid.Row="1" Grid.Column="1"
-                    <ComboBox  Grid.Row="1" Grid.Column="1"
                          ItemsSource="{Binding ScaleDXFList, Mode=OneWay}"
                          SelectedItem="{Binding SelectedDXFScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
                          Margin="10,0,0,5"/>
-                    <TextBox  Grid.Row="1" Grid.Column="2"
+               <TextBox Grid.Row="1" Grid.Column="2"
                         Text="{Binding DxfScaleFactor}" Height="25"
                         IsEnabled="{Binding DXFScaleEnable, UpdateSourceTrigger=LostFocus}"
                         VerticalContentAlignment="Center"
                         Margin="10,0,0,5"/>
-                    <TextBlock Grid.Row="2" Grid.Column="0"
+               <TextBlock Grid.Row="2" Grid.Column="0"
-                        Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
+                          Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Row="2" Grid.Column="1"
+               <ComboBox Grid.Row="2" Grid.Column="1"
-                        ItemsSource="{Binding ScaleSTLList, Mode=OneWay}"
+                         ItemsSource="{Binding ScaleSTLList, Mode=OneWay}"
                          SelectedItem="{Binding SelectedSTLScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
                          Margin="10,0,0,5"/>
-                    <TextBox Grid.Row="2" Grid.Column="2"
+               <TextBox Grid.Row="2" Grid.Column="2"
                         Text="{Binding StlScaleFactor}" Height="25"
                         IsEnabled="{Binding STLScaleEnable, UpdateSourceTrigger=LostFocus}"
                         VerticalContentAlignment="Center"
                         Margin="10,0,0,5"/>
-                    <TextBlock Grid.Row="3" Grid.Column="0"
+               <TextBlock Grid.Row="3" Grid.Column="0"
-                        Text="{Binding ImageScaleFactorMsg}" VerticalAlignment="Center"/>
+                          Text="{Binding ImageScaleFactorMsg}" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Row="3" Grid.Column="1"
+               <ComboBox Grid.Row="3" Grid.Column="1"
-                        ItemsSource="{Binding ScaleImageList, Mode=OneWay}"
+                         ItemsSource="{Binding ScaleImageList, Mode=OneWay}"
                          SelectedItem="{Binding SelectedImageScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
                          Margin="10,0,0,5"/>
-                    <TextBox Grid.Row="3" Grid.Column="2"
+               <TextBox Grid.Row="3" Grid.Column="2"
                         Text="{Binding ImageScaleFactor}" Height="25"
                         IsEnabled="{Binding ImageScaleEnable, UpdateSourceTrigger=LostFocus}"
-                         VerticalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
-                         Margin="10,0,0,5"/>
+                        Margin="10,0,0,5"/>
-                </Grid>
+            </Grid>
-            </StackPanel>
+         </StackPanel>
       </TabItem>
       <TabItem Header="{Binding ExportMsg}">
          <StackPanel>
@@ -196,15 +196,15 @@
                       Header="{Binding ImageMsg}"
                       Margin="5,5,5,0">
                <UniformGrid Grid.ColumnSpan="2" Columns="2">
-               <TextBlock Text="{Binding ImageWidthMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding ImageWidthMsg}" VerticalAlignment="Center"/>
-               <TextBox Text="{Binding ImageWidth}" Height="25"
+                  <TextBox Text="{Binding ImageWidth}" Height="25"
-                        VerticalContentAlignment="Center"
+                           VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
+                           Margin="10,0,0,5"/>
-               <TextBlock Text="{Binding ImageHeightMsg}" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding ImageHeightMsg}" VerticalAlignment="Center"/>
-               <TextBox Text="{Binding ImageHeight}" Height="25"
+                  <TextBox Text="{Binding ImageHeight}" Height="25"
-                        VerticalContentAlignment="Center"
+                           VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
+                           Margin="10,0,0,5"/>
-            </UniformGrid>
+               </UniformGrid>
             </GroupBox>
          </StackPanel>
       </TabItem>
@@ -260,6 +260,15 @@
                         </DataTemplate>
                      </ComboBox.ItemTemplate>
                   </ComboBox>
+                  <TextBlock Text="{Binding GeomTypeGenMsg}" VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedGenGeomType}" Height="25">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
                   <TextBlock Text="{Binding GeomTypeChiselingMsg}" VerticalAlignment="Center"/>
                   <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
                             SelectedItem="{Binding SelectedChiselingGeomType}" Height="25">
@@ -269,35 +278,80 @@
                         </DataTemplate>
                      </ComboBox.ItemTemplate>
                   </ComboBox>
+                  <TextBlock Text="{Binding GeomTypeSurRoughMsg}" VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedSurfRoughGeomType}" Height="25">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+                  <TextBlock Text="{Binding GeomTypeSurFinishMsg}" VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedSurfFinishGeomType}" Height="25">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+                  <!--<TextBlock Text="{Binding GeomTypeWaterJetMsg}" VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedWaterJetGeomType}" Height="25">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>-->
+                  <TextBlock Text="{Binding GeomTypeFiveAxMsg}" VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedFiveAxGeomType}" Height="25">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
                </UniformGrid>
             </GroupBox>
-            
+
-            <Grid Margin="5,5,5,0">
+            <Grid Margin="10,5,10,0">
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
+               <UniformGrid Columns="2" Grid.ColumnSpan="2" Margin="0,5,0,0">
-                  <RowDefinition Height="1*"/>
+                  <TextBlock Text="{Binding VMillQualityMsg}" VerticalAlignment="Center"/>
-                  <RowDefinition Height="1*"/>
+                  <ComboBox ItemsSource="{Binding VMillTypeList, Mode=OneWay}"
-               </Grid.RowDefinitions>
+                            SelectedItem="{Binding SelectedVMillTypeType}" Height="25">
-               <TextBlock Text="{Binding NewMachiningPosMsg}" VerticalAlignment="Center"
+                     <ComboBox.ItemTemplate>
-                          Grid.Row="0" Margin="0,0,0,5"/>
+                        <DataTemplate>
-               <CheckBox IsChecked="{Binding NewMachiningIsLastOne}"
+                           <TextBlock Text="{Binding Converter={StaticResource VMillTypeConverter}}"/>
-                         Grid.Column="1" Grid.Row="0" Margin="4,0,0,0" VerticalAlignment="Center"/>
+                        </DataTemplate>
-               <TextBlock Text="{Binding UseDispositionScriptMsg}" VerticalAlignment="Center"
+                     </ComboBox.ItemTemplate>
-                          Grid.Row="1" Margin="0,0,0,5"/>
+                  </ComboBox>
-               <CheckBox IsChecked="{Binding UseDispositionScript}"
+               </UniformGrid>
-                         Grid.Column="1" Grid.Row="1" Margin="4,0,0,0" VerticalAlignment="Center"/>
+               <TextBlock Grid.Row="1" Text="{Binding NewMachiningPosMsg}" VerticalAlignment="Center" 
+                          Margin="0,8,0,5"/>
+               <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding NewMachiningIsLastOne}"
+                         Margin="4,8,0,0" VerticalAlignment="Center"/>
+               <TextBlock Grid.Row="2" Text="{Binding UseDispositionScriptMsg}"
+                          VerticalAlignment="Center" Margin="0,5,0,5"/>
+               <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding UseDispositionScript}"
+                         Margin="4,5,0,0" VerticalAlignment="Center"/>
             </Grid>
 
-            <Grid Margin="5,5,5,0">
+            <UniformGrid Rows="2">
-               <Button Content="{Binding AddMachineMsg}" Command="{Binding AddMachine_Command}"  Height="26" Margin="100,1"/>
+               <Button Content="{Binding AddMachineMsg}" Command="{Binding AddMachine_Command}" Height="26" Margin="100,10,100,5"/>
-            </Grid>
+               <Button Content="{Binding ExportMachineMsg}" Command="{Binding ExportMachine_Command}" Height="26" Margin="100,1"/>
-
+            </UniformGrid>
-            <Grid Margin="5,5,5,0">
-                <Button Content="{Binding ExportMachineMsg}" Command="{Binding ExportMachine_Command}"  Height="26" Margin="100,1"/>
-            </Grid>
          </StackPanel>
       </TabItem>
 
@@ -343,9 +397,9 @@
                <CheckBox IsChecked="{Binding GunstockOn}" IsEnabled="{Binding GunstockEnabled}"
                          Grid.Row="4" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
             </Grid>
-         </StackPanel>   
+         </StackPanel>
       </TabItem>
 
    </TabControl>
-   
+
 </EgtWPFLib5:EgtCustomWindow>

OptionsWindow/OptionWindowVM.vb

@@ -2,6 +2,7 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
 Imports EgtUILib
+Imports System.Globalization
 
 Public Class OptionWindowVM
    Inherits VMBase
@@ -19,6 +20,13 @@ Public Class OptionWindowVM
       End Get
    End Property
 
+   Private m_VMillTypeList As ObservableCollection(Of VMillSelTypeOpt) = New ObservableCollection(Of VMillSelTypeOpt)({VMillSelTypeOpt.LOWER, VMillSelTypeOpt.LOW, VMillSelTypeOpt.STANDARD, VMillSelTypeOpt.HIGH, VMillSelTypeOpt.HIGHER})
+   Public ReadOnly Property VMillTypeList As ObservableCollection(Of VMillSelTypeOpt)
+      Get
+         Return m_VMillTypeList
+      End Get
+   End Property
+
    Private m_UnitMeasureList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(MSG_OPTIONPAGE + 45)})
    Public ReadOnly Property UnitMeasureList As List(Of String)
       Get
@@ -137,6 +145,72 @@ Public Class OptionWindowVM
       End Set
    End Property
 
+   Public Property SelectedGenGeomType As SceneSelModeOpt
+      Get
+         Return OptionModule.m_SelGeomGenMachining
+      End Get
+      Set(value As SceneSelModeOpt)
+         If WritePrivateProfileString(S_MACH, K_SELGEOMGENMACHINING, CInt(value).ToString()) Then
+            OptionModule.m_SelGeomGenMachining = value
+         End If
+      End Set
+   End Property
+
+   Public Property SelectedSurfRoughGeomType As SceneSelModeOpt
+      Get
+         Return OptionModule.m_SelGeomSurfRoughing
+      End Get
+      Set(value As SceneSelModeOpt)
+         If WritePrivateProfileString(S_MACH, K_SELGEOMSURFROUGHING, CInt(value).ToString()) Then
+            OptionModule.m_SelGeomSurfRoughing = value
+         End If
+      End Set
+   End Property
+
+   Public Property SelectedSurfFinishGeomType As SceneSelModeOpt
+      Get
+         Return OptionModule.m_SelGeomSurfFinishing
+      End Get
+      Set(value As SceneSelModeOpt)
+         If WritePrivateProfileString(S_MACH, K_SELGEOMSURFFINISHING, CInt(value).ToString()) Then
+            OptionModule.m_SelGeomSurfFinishing = value
+         End If
+      End Set
+   End Property
+
+   'Public Property SelectedWaterJetGeomType As SceneSelModeOpt
+   '   Get
+   '      Return OptionModule.m_SelGeomWaterJetting
+   '   End Get
+   '   Set(value As SceneSelModeOpt)
+   '      If WritePrivateProfileString(S_MACH, K_SELGEOMWATERJETTING, CInt(value).ToString()) Then
+   '         OptionModule.m_SelGeomWaterJetting = value
+   '      End If
+   '   End Set
+   'End Property
+
+   Public Property SelectedFiveAxGeomType As SceneSelModeOpt
+      Get
+         Return OptionModule.m_SelGeomFiveAxMilling
+      End Get
+      Set(value As SceneSelModeOpt)
+         If WritePrivateProfileString(S_MACH, K_SELGEOMFIVEAXMILLING, CInt(value).ToString()) Then
+            OptionModule.m_SelGeomFiveAxMilling = value
+         End If
+      End Set
+   End Property
+
+   Public Property SelectedVMillTypeType As VMillSelTypeOpt
+      Get
+         Return OptionModule.m_SelVMillQuality
+      End Get
+      Set(value As VMillSelTypeOpt)
+         If WritePrivateProfileString(S_MACH, K_SELVMILLQUALITY, CInt(value).ToString()) Then
+            OptionModule.m_SelVMillQuality = value
+         End If
+      End Set
+   End Property
+
    Public Property GeometryTolerance As String
       Get
          Return LenToString(OptionModule.m_dGeometryTolerance, 5)
@@ -213,8 +287,8 @@ Public Class OptionWindowVM
       End Get
       Set(value As Boolean)
          OptionModule.m_bThickLine = value
-         WritePrivateProfileString(S_SCENE, K_LINEWIDTH, If( value, "2", "1"))
+         WritePrivateProfileString(S_SCENE, K_LINEWIDTH, If(value, "2", "1"))
-         EgtSetLineAttribs( If( value, 2, 1))
+         EgtSetLineAttribs(If(value, 2, 1))
       End Set
    End Property
 
@@ -534,7 +608,7 @@ Public Class OptionWindowVM
       End Get
       Set(value As Boolean)
          OptionModule.m_bSpecialOn = value
-         WritePrivateProfileString(S_SPECIAL, K_SPECIALENABLE, If( value, "1", "0"))
+         WritePrivateProfileString(S_SPECIAL, K_SPECIALENABLE, If(value, "1", "0"))
       End Set
    End Property
 
@@ -554,7 +628,7 @@ Public Class OptionWindowVM
       End Get
       Set(value As Boolean)
          OptionModule.m_bBeamOn = value
-         WritePrivateProfileString(S_BEAM, K_BEAMENABLE, If( value, "1", "0"))
+         WritePrivateProfileString(S_BEAM, K_BEAMENABLE, If(value, "1", "0"))
       End Set
    End Property
 
@@ -574,7 +648,7 @@ Public Class OptionWindowVM
       End Get
       Set(value As Boolean)
          OptionModule.m_bWallOn = value
-         WritePrivateProfileString(S_WALL, K_WALLENABLE, If( value, "1", "0"))
+         WritePrivateProfileString(S_WALL, K_WALLENABLE, If(value, "1", "0"))
       End Set
    End Property
 
@@ -589,7 +663,7 @@ Public Class OptionWindowVM
       End Get
       Set(value As Boolean)
          OptionModule.m_bDoorsOn = value
-         WritePrivateProfileString(S_DOORS, K_DDFENABLE, If( value, "1", "0"))
+         WritePrivateProfileString(S_DOORS, K_DDFENABLE, If(value, "1", "0"))
       End Set
    End Property
 
@@ -604,7 +678,7 @@ Public Class OptionWindowVM
       End Get
       Set(value As Boolean)
          OptionModule.m_bGunstockOn = value
-         WritePrivateProfileString(S_GUNSTOCK, K_GUNSTOCKENABLE, If( value, "1", "0"))
+         WritePrivateProfileString(S_GUNSTOCK, K_GUNSTOCKENABLE, If(value, "1", "0"))
       End Set
    End Property
 
@@ -662,17 +736,17 @@ Public Class OptionWindowVM
    End Property
    Public ReadOnly Property ThickLineMsg As String
       Get
-         Return EgtMsg( 6536)                     ' Linee spesse
+         Return EgtMsg(6536)                     ' Linee spesse
       End Get
    End Property
    Public ReadOnly Property SmoothTriMeshMsg As String
       Get
-         Return EgtMsg( 6518)                     ' Superfici smussate
+         Return EgtMsg(6518)                     ' Superfici smussate
       End Get
    End Property
    Public ReadOnly Property UpdateLicenceMsg As String
       Get
-         Return EgtMsg( 6553)                     ' Aggiorna licenza
+         Return EgtMsg(6553)                     ' Aggiorna licenza
       End Get
    End Property
 
@@ -881,6 +955,43 @@ Public Class OptionWindowVM
       End Get
    End Property
 
+   Public ReadOnly Property GeomTypeGenMsg As String
+      Get
+         Return EgtMsg(6208)
+      End Get
+   End Property
+
+   Public ReadOnly Property GeomTypeSurFinishMsg As String
+      Get
+         Return EgtMsg(6211)
+      End Get
+   End Property
+
+   Public ReadOnly Property GeomTypeWaterJetMsg As String
+      Get
+         Return EgtMsg(6212)
+      End Get
+   End Property
+
+   Public ReadOnly Property GeomTypeFiveAxMsg As String
+      Get
+         Return EgtMsg(31213)
+      End Get
+   End Property
+
+   Public ReadOnly Property GeomTypeSurRoughMsg As String
+      Get
+         Return EgtMsg(31212)
+      End Get
+   End Property
+
+   Public ReadOnly Property VMillQualityMsg As String
+      Get
+         Return EgtMsg(31214)
+      End Get
+   End Property
+
+
 #End Region
 
 #Region "COMMANDS"
@@ -1094,135 +1205,135 @@ Public Class OptionWindowVM
       Dim sMachDir As String = Path.Combine(IniFile.m_sMachinesRoot, sMachName)
       ' Preparo direttorio temporaneo
       Dim sTempDir As String = Path.Combine(IniFile.m_sMachinesRoot, "Temp")
-      If My.Computer.FileSystem.DirectoryExists( sTempDir) Then
+      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       End If
-      My.Computer.FileSystem.CreateDirectory( sTempDir)
+      My.Computer.FileSystem.CreateDirectory(sTempDir)
       ' Unzip nel direttorio temporaneo
       Using zip As New Ionic.Zip.ZipFile(sMachZip)
-         zip.ExtractAll( sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
+         zip.ExtractAll(sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
       End Using
       ' Se non è una macchina segnalo il problema ed esco
-      If Not My.Computer.FileSystem.FileExists( Path.Combine( sTempDir, sMachName, sMachName & ".ini"))  Or
+      If Not My.Computer.FileSystem.FileExists(Path.Combine(sTempDir, sMachName, sMachName & ".ini")) Or
-         Not My.Computer.FileSystem.FileExists( Path.Combine( sTempDir, sMachName, sMachName & ".mlde")) Then
+         Not My.Computer.FileSystem.FileExists(Path.Combine(sTempDir, sMachName, sMachName & ".mlde")) Then
          ' Il file {0} non contiene una macchina  -  Avviso
          Dim sOut As String = String.Format(EgtMsg(MSG_OPTIONPAGE + 29), sMachZip)
          MessageBox.Show(sOut, EgtMsg(MSG_MESSAGEBOX + 2), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End If
       ' Imposto data e ora correnti al file mlde della macchina
       Try
-         File.SetLastWriteTime( Path.Combine( sTempDir, sMachName, sMachName & ".mlde"), System.DateTime.Now)
+         File.SetLastWriteTime(Path.Combine(sTempDir, sMachName, sMachName & ".mlde"), System.DateTime.Now)
       Catch ex As Exception
       End Try
       ' Verifico esistenza di una macchina con lo stesso nome
-      Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists( sMachDir)
+      Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists(sMachDir)
       Dim bUpdate As Boolean = True
       If bOldExists Then
-         Dim MachBox As New MachineBox( Application.Current.MainWindow, sMachName)
+         Dim MachBox As New MachineBox(Application.Current.MainWindow, sMachName)
-         Select MachBox.ShowDialog()
+         Select Case MachBox.ShowDialog()
-         Case MessageBoxResult.Yes
+            Case MessageBoxResult.Yes
-            bUpdate = False
+               bUpdate = False
-         Case MessageBoxResult.No
+            Case MessageBoxResult.No
-            bUpdate = True
+               bUpdate = True
-         Case MessageBoxResult.Cancel
+            Case MessageBoxResult.Cancel
-            ' Rimuovo il direttorio temporaneo ed esco
+               ' Rimuovo il direttorio temporaneo ed esco
-            My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+               My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
-            Return
+               Return
          End Select
          ' Faccio una copia di backup della macchina corrente
          Dim sBackupDir As String = sMachDir & ".old"
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir) Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir) Then
-            My.Computer.FileSystem.DeleteDirectory( sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+            My.Computer.FileSystem.DeleteDirectory(sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          End If
          Try
-            My.Computer.FileSystem.MoveDirectory( sMachDir, sBackupDir, True)
+            My.Computer.FileSystem.MoveDirectory(sMachDir, sBackupDir, True)
          Catch ex As Exception
             ' Ripristino lo stato originale ed esco
-            My.Computer.FileSystem.MoveDirectory( sBackupDir, sMachDir, True)
+            My.Computer.FileSystem.MoveDirectory(sBackupDir, sMachDir, True)
             ' L'aggiornamento della macchina "{0}" non è riuscito.
             Dim sKo As String = String.Format(EgtMsg(MSG_OPTIONPAGE + 35), sMachName)
-            EgtOutLog( sKo)
+            EgtOutLog(sKo)
             MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
             Return
          End Try
       End If
       ' Installo la macchina
-      My.Computer.FileSystem.MoveDirectory( Path.Combine( sTempDir, sMachName), sMachDir, True)
+      My.Computer.FileSystem.MoveDirectory(Path.Combine(sTempDir, sMachName), sMachDir, True)
       ' Se è un aggiornamento, recupero utensili, lavorazioni, attrezzaggi e dati per travi
       If bOldExists And bUpdate Then
          Dim sBackupDir As String = sMachDir & ".old"
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir & "\Tools") Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\Tools") Then
-            If My.Computer.FileSystem.DirectoryExists( sMachDir & "\Tools") Then
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\Tools") Then
-                My.Computer.FileSystem.DeleteDirectory( sMachDir & "\Tools", FileIO.DeleteDirectoryOption.DeleteAllContents)
+               My.Computer.FileSystem.DeleteDirectory(sMachDir & "\Tools", FileIO.DeleteDirectoryOption.DeleteAllContents)
             End If
-            My.Computer.FileSystem.CopyDirectory( sBackupDir & "\Tools", sMachDir & "\Tools", True)
+            My.Computer.FileSystem.CopyDirectory(sBackupDir & "\Tools", sMachDir & "\Tools", True)
          End If
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir & "\Machinings") Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\Machinings") Then
-            If My.Computer.FileSystem.DirectoryExists( sMachDir & "\Machinings") Then
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\Machinings") Then
-                My.Computer.FileSystem.DeleteDirectory( sMachDir & "\Machinings", FileIO.DeleteDirectoryOption.DeleteAllContents)
+               My.Computer.FileSystem.DeleteDirectory(sMachDir & "\Machinings", FileIO.DeleteDirectoryOption.DeleteAllContents)
             End If
-            My.Computer.FileSystem.CopyDirectory( sBackupDir & "\Machinings", sMachDir & "\Machinings", True)
+            My.Computer.FileSystem.CopyDirectory(sBackupDir & "\Machinings", sMachDir & "\Machinings", True)
          End If
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir & "\SetUp") Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\SetUp") Then
-            If My.Computer.FileSystem.DirectoryExists( sMachDir & "\SetUp") Then
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\SetUp") Then
-                My.Computer.FileSystem.DeleteDirectory( sMachDir & "\SetUp", FileIO.DeleteDirectoryOption.DeleteAllContents)
+               My.Computer.FileSystem.DeleteDirectory(sMachDir & "\SetUp", FileIO.DeleteDirectoryOption.DeleteAllContents)
             End If
-            My.Computer.FileSystem.CopyDirectory( sBackupDir & "\SetUp", sMachDir & "\SetUp", True)
+            My.Computer.FileSystem.CopyDirectory(sBackupDir & "\SetUp", sMachDir & "\SetUp", True)
          End If
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir & "\Beam") Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\Beam") Then
             ' Flag per sovrascrivere vecchio file BeamData.lua con nuovo
             Dim bBeamDataExists As Boolean = False
             Const sBeamData As String = "\BeamData.lua"
             ' Flag per sovrascrivere vecchio file MachiningTypes.ini
             Dim bMchgTypesExists As Boolean = False
             Const sMchgTypes As String = "\MachiningTypes.ini"
-            If My.Computer.FileSystem.DirectoryExists( sMachDir & "\Beam") Then
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\Beam") Then
-               If My.Computer.FileSystem.FileExists( sMachDir & "\Beam" & sBeamData) Then
+               If My.Computer.FileSystem.FileExists(sMachDir & "\Beam" & sBeamData) Then
                   bBeamDataExists = True
-                  My.Computer.FileSystem.MoveFile( sMachDir & "\Beam" & sBeamData, sMachDir & sBeamData, True) 
+                  My.Computer.FileSystem.MoveFile(sMachDir & "\Beam" & sBeamData, sMachDir & sBeamData, True)
                End If
-               If My.Computer.FileSystem.FileExists( sMachDir & "\Beam" & sMchgTypes) Then
+               If My.Computer.FileSystem.FileExists(sMachDir & "\Beam" & sMchgTypes) Then
                   bMchgTypesExists = True
-                  My.Computer.FileSystem.MoveFile( sMachDir & "\Beam" & sMchgTypes, sMachDir & sMchgTypes, True) 
+                  My.Computer.FileSystem.MoveFile(sMachDir & "\Beam" & sMchgTypes, sMachDir & sMchgTypes, True)
                End If
-               My.Computer.FileSystem.DeleteDirectory( sMachDir & "\Beam", FileIO.DeleteDirectoryOption.DeleteAllContents)
+               My.Computer.FileSystem.DeleteDirectory(sMachDir & "\Beam", FileIO.DeleteDirectoryOption.DeleteAllContents)
             End If
-            My.Computer.FileSystem.CopyDirectory( sBackupDir & "\Beam", sMachDir & "\Beam", True)
+            My.Computer.FileSystem.CopyDirectory(sBackupDir & "\Beam", sMachDir & "\Beam", True)
-            If bBeamDataExists Then My.Computer.FileSystem.MoveFile( sMachDir & sBeamData, sMachDir & "\Beam" & sBeamData, True)
+            If bBeamDataExists Then My.Computer.FileSystem.MoveFile(sMachDir & sBeamData, sMachDir & "\Beam" & sBeamData, True)
-            If bMchgTypesExists Then My.Computer.FileSystem.MoveFile( sMachDir & sMchgTypes, sMachDir & "\Beam" & sMchgTypes, True)
+            If bMchgTypesExists Then My.Computer.FileSystem.MoveFile(sMachDir & sMchgTypes, sMachDir & "\Beam" & sMchgTypes, True)
          End If
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir & "\Wall") Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\Wall") Then
             ' Flag per sovrascrittura vecchio file WallData.lua con nuovo
             Dim bWallDataExists As Boolean = False
             Const sWallData As String = "\WallData.lua"
             ' Flag per sovrascrivere vecchio file MachiningTypes.ini
             Dim bMchgTypesExists As Boolean = False
             Const sMchgTypes As String = "\MachiningTypes.ini"
-            If My.Computer.FileSystem.DirectoryExists( sMachDir & "\Wall") Then
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\Wall") Then
-               If My.Computer.FileSystem.FileExists( sMachDir & "\Wall" & sWallData) Then
+               If My.Computer.FileSystem.FileExists(sMachDir & "\Wall" & sWallData) Then
                   bWallDataExists = True
-                  My.Computer.FileSystem.MoveFile( sMachDir & "\Wall" & sWallData, sMachDir & sWallData, True) 
+                  My.Computer.FileSystem.MoveFile(sMachDir & "\Wall" & sWallData, sMachDir & sWallData, True)
                End If
-               If My.Computer.FileSystem.FileExists( sMachDir & "\Wall" & sMchgTypes) Then
+               If My.Computer.FileSystem.FileExists(sMachDir & "\Wall" & sMchgTypes) Then
                   bMchgTypesExists = True
-                  My.Computer.FileSystem.MoveFile( sMachDir & "\Wall" & sMchgTypes, sMachDir & sMchgTypes, True) 
+                  My.Computer.FileSystem.MoveFile(sMachDir & "\Wall" & sMchgTypes, sMachDir & sMchgTypes, True)
                End If
-               My.Computer.FileSystem.DeleteDirectory( sMachDir & "\Wall", FileIO.DeleteDirectoryOption.DeleteAllContents)
+               My.Computer.FileSystem.DeleteDirectory(sMachDir & "\Wall", FileIO.DeleteDirectoryOption.DeleteAllContents)
             End If
-            My.Computer.FileSystem.CopyDirectory( sBackupDir & "\Wall", sMachDir & "\Wall", True)
+            My.Computer.FileSystem.CopyDirectory(sBackupDir & "\Wall", sMachDir & "\Wall", True)
-            If bWallDataExists Then My.Computer.FileSystem.MoveFile( sMachDir & sWallData, sMachDir & "\Wall" & sWallData, True)
+            If bWallDataExists Then My.Computer.FileSystem.MoveFile(sMachDir & sWallData, sMachDir & "\Wall" & sWallData, True)
-            If bMchgTypesExists Then My.Computer.FileSystem.MoveFile( sMachDir & sMchgTypes, sMachDir & "\Wall" & sMchgTypes, True)
+            If bMchgTypesExists Then My.Computer.FileSystem.MoveFile(sMachDir & sMchgTypes, sMachDir & "\Wall" & sMchgTypes, True)
          End If
       End If
       'La macchina "{0}" è stata aggiornata con successo.
       Dim sOk As String = String.Format(EgtMsg(MSG_OPTIONPAGE + 30), sMachName)
-      EgtOutLog( sOk)
+      EgtOutLog(sOk)
       MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
       ' Rimuovo il direttorio temporaneo
-      My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+      My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       ' Aggiorno la lista delle macchina
       Map.refMachinePanelVM.InsertMachine(sMachDir)
    End Sub
@@ -1270,7 +1381,7 @@ Public Class OptionWindowVM
             ' aggiungo i file della Macchina
             Dim sMachineDir As String = IniFile.m_sMachinesRoot & "\" & sCurrMachineName
             If Directory.Exists(sMachineDir) Then
-               zip.AddSelectedFiles( "name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
+               zip.AddSelectedFiles("name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
             End If
             ' salvo lo zip
             zip.Save()
@@ -1281,7 +1392,7 @@ Public Class OptionWindowVM
          Dim sKo As String = String.Format(EgtMsg(6551), sCurrMachineName)
          EgtOutLog(sKo)
          MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
-         return
+         Return
       End Try
       'La macchina "{0}" è stata esportata con successo.
       Dim sOk As String = String.Format(EgtMsg(6552), sCurrMachineName)
@@ -1306,10 +1417,10 @@ Public Class OptionWindowVM
       Dim sExeVer As String = IniFile.GetProgramVersion()
       ' Verifico presenza di una precedente installazione del Beam
       Dim sBeamVer As String = ""
-      IniFile.GetSpecialLuaVersion( IniFile.m_sBeamDirPath, sBeamVer)
+      IniFile.GetSpecialLuaVersion(IniFile.m_sBeamDirPath, sBeamVer)
-      If String.IsNullOrEmpty( sBeamVer) Then
+      If String.IsNullOrEmpty(sBeamVer) Then
          ' Il modulo "{0}" non è stato trovato, impossibile aggiornare. - Avviso
-         Dim sOut As String = String.Format(EgtMsg(6555), "Beam") 
+         Dim sOut As String = String.Format(EgtMsg(6555), "Beam")
          MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Esco
          Return
@@ -1325,26 +1436,26 @@ Public Class OptionWindowVM
       Dim sBeamZip As String = BeamDlg.FileName
       ' Preparo direttorio temporaneo
       Dim sTempDir As String = Path.Combine(IniFile.m_sTempDir, "Beam")
-      If My.Computer.FileSystem.DirectoryExists( sTempDir) Then
+      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       End If
-      My.Computer.FileSystem.CreateDirectory( sTempDir)
+      My.Computer.FileSystem.CreateDirectory(sTempDir)
       ' Unzip nel direttorio temporaneo
       Using zip As New Ionic.Zip.ZipFile(sBeamZip)
-         zip.ExtractAll( sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
+         zip.ExtractAll(sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
       End Using
       ' Recupero i dati del nuovo Beam
       Dim sNewName = ""
       Dim sNewVer = ""
       Dim sNewMinExe = ""
-      IniFile.GetSpecialLuaData( sTempDir, sNewName, sNewVer, sNewMinExe)
+      IniFile.GetSpecialLuaData(sTempDir, sNewName, sNewVer, sNewMinExe)
       ' Verifico che sia veramente il Beam
       If String.Compare(sNewName, "Beam") <> 0 Then
          ' Il file zip non contiene il modulo "{0}". - Avviso
-         Dim sOut As String = String.Format(EgtMsg(6556), "Beam") 
+         Dim sOut As String = String.Format(EgtMsg(6556), "Beam")
          MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End If
       ' Verifico la versione minima del programma
@@ -1353,42 +1464,42 @@ Public Class OptionWindowVM
          Dim sOut As String = String.Format(EgtMsg(6557), "Beam", sNewMinExe)
          MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End If
       ' Verifico la versione del Beam e se più vecchia chiedo cosa fare
       If String.Compare(sNewVer, sBeamVer) < 0 Then
          ' La versione del nuovo modulo "{0}" è più vecchia dell'attuale. Vuoi sovrascrivere lo stesso ?
          Dim sOut As String = String.Format(EgtMsg(6558), "Beam")
-         if MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then
+         If MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then
             ' Rimuovo il direttorio temporaneo ed esco
-            My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+            My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
             Return
          End If
       End If
       ' Faccio una copia di backup del Beam corrente
       Dim sBackupDir As String = IniFile.m_sBeamDirPath & ".old"
-      If My.Computer.FileSystem.DirectoryExists( sBackupDir) Then
+      If My.Computer.FileSystem.DirectoryExists(sBackupDir) Then
-         My.Computer.FileSystem.DeleteDirectory( sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       End If
       Try
-         My.Computer.FileSystem.MoveDirectory( IniFile.m_sBeamDirPath, sBackupDir, True)
+         My.Computer.FileSystem.MoveDirectory(IniFile.m_sBeamDirPath, sBackupDir, True)
       Catch ex As Exception
          ' Ripristino lo stato originale ed esco
-         My.Computer.FileSystem.MoveDirectory( sBackupDir, IniFile.m_sBeamDirPath, True)
+         My.Computer.FileSystem.MoveDirectory(sBackupDir, IniFile.m_sBeamDirPath, True)
          ' L'aggiornamento del modulo "{0}" non è riuscito. - Errore
          Dim sOut As String = String.Format(EgtMsg(6559), "Beam")
-         EgtOutLog( sOut)
+         EgtOutLog(sOut)
          MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End Try
       ' Installo il Beam
-      My.Computer.FileSystem.MoveDirectory( sTempDir, IniFile.m_sBeamDirPath, True)
+      My.Computer.FileSystem.MoveDirectory(sTempDir, IniFile.m_sBeamDirPath, True)
       ' Il modulo "{0}" è stata aggiornato con successo. - Info
       Dim sOk As String = String.Format(EgtMsg(6560), "Beam")
-      EgtOutLog( sOk)
+      EgtOutLog(sOk)
       MessageBox.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK)
    End Sub
 
@@ -1410,10 +1521,10 @@ Public Class OptionWindowVM
       Dim sExeVer As String = IniFile.GetProgramVersion()
       ' Verifico presenza di una precedente installazione del Wall
       Dim sWallVer As String = ""
-      IniFile.GetSpecialLuaVersion( IniFile.m_sWallDirPath, sWallVer)
+      IniFile.GetSpecialLuaVersion(IniFile.m_sWallDirPath, sWallVer)
-      If String.IsNullOrEmpty( sWallVer) Then
+      If String.IsNullOrEmpty(sWallVer) Then
          ' Il modulo "{0}" non è stato trovato, impossibile aggiornare. - Avviso
-         Dim sOut As String = String.Format(EgtMsg(6555), "Wall") 
+         Dim sOut As String = String.Format(EgtMsg(6555), "Wall")
          MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Esco
          Return
@@ -1429,26 +1540,26 @@ Public Class OptionWindowVM
       Dim sWallZip As String = WallDlg.FileName
       ' Preparo direttorio temporaneo
       Dim sTempDir As String = Path.Combine(IniFile.m_sTempDir, "Wall")
-      If My.Computer.FileSystem.DirectoryExists( sTempDir) Then
+      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       End If
-      My.Computer.FileSystem.CreateDirectory( sTempDir)
+      My.Computer.FileSystem.CreateDirectory(sTempDir)
       ' Unzip nel direttorio temporaneo
       Using zip As New Ionic.Zip.ZipFile(sWallZip)
-         zip.ExtractAll( sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
+         zip.ExtractAll(sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
       End Using
       ' Recupero i dati del nuovo Wall
       Dim sNewName = ""
       Dim sNewVer = ""
       Dim sNewMinExe = ""
-      IniFile.GetSpecialLuaData( sTempDir, sNewName, sNewVer, sNewMinExe)
+      IniFile.GetSpecialLuaData(sTempDir, sNewName, sNewVer, sNewMinExe)
       ' Verifico che sia veramente il Wall
       If String.Compare(sNewName, "Wall") <> 0 Then
          ' Il file zip non contiene il modulo "{0}". - Avviso
-         Dim sOut As String = String.Format(EgtMsg(6556), "Wall") 
+         Dim sOut As String = String.Format(EgtMsg(6556), "Wall")
          MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End If
       ' Verifico la versione minima del programma
@@ -1457,42 +1568,42 @@ Public Class OptionWindowVM
          Dim sOut As String = String.Format(EgtMsg(6557), "Wall", sNewMinExe)
          MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End If
       ' Verifico la versione del Wall e se più vecchia chiedo cosa fare
       If String.Compare(sNewVer, sWallVer) < 0 Then
          ' La versione del nuovo modulo "{0}" è più vecchia dell'attuale. Vuoi sovrascrivere lo stesso ?
          Dim sOut As String = String.Format(EgtMsg(6558), "Wall")
-         if MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then
+         If MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then
             ' Rimuovo il direttorio temporaneo ed esco
-            My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+            My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
             Return
          End If
       End If
       ' Faccio una copia di backup del Wall corrente
       Dim sBackupDir As String = IniFile.m_sWallDirPath & ".old"
-      If My.Computer.FileSystem.DirectoryExists( sBackupDir) Then
+      If My.Computer.FileSystem.DirectoryExists(sBackupDir) Then
-         My.Computer.FileSystem.DeleteDirectory( sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       End If
       Try
-         My.Computer.FileSystem.MoveDirectory( IniFile.m_sWallDirPath, sBackupDir, True)
+         My.Computer.FileSystem.MoveDirectory(IniFile.m_sWallDirPath, sBackupDir, True)
       Catch ex As Exception
          ' Ripristino lo stato originale ed esco
-         My.Computer.FileSystem.MoveDirectory( sBackupDir, IniFile.m_sWallDirPath, True)
+         My.Computer.FileSystem.MoveDirectory(sBackupDir, IniFile.m_sWallDirPath, True)
          ' L'aggiornamento del modulo "{0}" non è riuscito. - Errore
          Dim sOut As String = String.Format(EgtMsg(6559), "Wall")
-         EgtOutLog( sOut)
+         EgtOutLog(sOut)
          MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End Try
       ' Installo il Wall
-      My.Computer.FileSystem.MoveDirectory( sTempDir, IniFile.m_sWallDirPath, True)
+      My.Computer.FileSystem.MoveDirectory(sTempDir, IniFile.m_sWallDirPath, True)
       ' Il modulo "{0}" è stata aggiornato con successo. - Info
       Dim sOk As String = String.Format(EgtMsg(6560), "Wall")
-      EgtOutLog( sOk)
+      EgtOutLog(sOk)
       MessageBox.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK)
    End Sub
 
@@ -1580,4 +1691,29 @@ Public Class GeomTypeConverter
       Throw New NotImplementedException
    End Function
 
+End Class
+
+Public Class VMillTypeConverter
+   Implements IValueConverter
+
+   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
+      Select Case CInt(value)
+         Case VMillSelTypeOpt.LOWER
+            Return EgtMsg(31215)
+         Case VMillSelTypeOpt.LOW
+            Return EgtMsg(31216)
+         Case VMillSelTypeOpt.STANDARD
+            Return EgtMsg(31217)
+         Case VMillSelTypeOpt.HIGH
+            Return EgtMsg(31218)
+         Case VMillSelTypeOpt.HIGHER
+            Return EgtMsg(31219)
+         Case Else
+            Return ""
+      End Select
+   End Function
+
+   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New NotImplementedException()
+   End Function
 End Class

Project/ProjectV.xaml

@@ -16,7 +16,7 @@
          <Setter Property="DockPanel.Dock" Value="{Binding}" />
       </Style>
    </ItemsControl.ItemContainerStyle>
-   
+
    <interactivity:Interaction.Triggers>
       <interactivity:EventTrigger EventName="Loaded">
          <interactivity:InvokeCommandAction Command="{Binding LoadedCommand}"/>

Project/ProjectVM.vb

@@ -58,11 +58,25 @@ 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
+   Private m_bCPlaneTypePos As Boolean
 
    ' Variabile per implementazione eventi
    Private m_InputText As String
@@ -79,6 +93,17 @@ 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 = {}
@@ -105,30 +130,57 @@ 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
-         m_PanelList.Add(New BottomTrayV)
+         ' aggiungo gridSplitter alla griglia
-         m_PanelList.Add(New TopTrayV)
+         m_DynamicGrid.Children.Add(gridSplitter)
+         'm_PanelList.Add(New BottomTrayV)
+         ' aggiungo BottomTrayV alla griglia
+         m_DynamicGrid.Children.Add(m_BottomTrayV)
+         'm_PanelList.Add(New TopTrayV)
+         ' aggiungo TopTrayV alla griglia
+         m_DynamicGrid.Children.Add(m_TopTrayV)
          ' nascondo tasti gestione progetto se attivo plugin
          Map.refTopCommandBarVM.SetProjectManagerVisibility(False)
       Else
-         m_PanelList.Add(New TopTrayV)
+         PololateGrid(m_TopTrayV, m_LeftTrayV, m_RightTrayV, m_BottomTrayV, m_SceneContentControlV, gridSplitter)
-         m_PanelList.Add(New LeftTrayV)
+         'm_PanelList.Add(New TopTrayV)
-         m_PanelList.Add(New RightTrayV)
+         'm_PanelList.Add(New LeftTrayV)
-         m_PanelList.Add(New BottomTrayV)
+         'm_PanelList.Add(New RightTrayV)
+         'm_PanelList.Add(New BottomTrayV)
+         ' aggiungo TopTrayV alla griglia
+         m_DynamicGrid.Children.Add(m_TopTrayV)
+         ' aggiungo LeftTrayV alla griglia
+         m_DynamicGrid.Children.Add(m_LeftTrayV)
+         ' aggiungo gridSplitter alla griglia
+         m_DynamicGrid.Children.Add(gridSplitter)
+         ' aggiungo RightTrayV alla griglia
+         m_DynamicGrid.Children.Add(m_RightTrayV)
+         ' aggiungo BottomTrayV alla griglia
+         m_DynamicGrid.Children.Add(m_BottomTrayV)
       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
@@ -244,14 +296,14 @@ Public Class ProjectVM
             Dim sTitle As String = EgtMsg(10101)
             MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
          End If
-      ' Se altrimenti manca il collegamento con la chiave di rete
+         ' Se altrimenti manca il collegamento con la chiave di rete
       ElseIf IniFile.m_nKeyLevel = -9 Then
          EgtOutLog("Missing Link with Net Dongle")
          ' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione."  "Errore"
          Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109)
          Dim sTitle As String = EgtMsg(10101)
          MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-      ' Altrimenti manca la licenza
+         ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : sKeyInfo \n "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
@@ -292,6 +344,125 @@ 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)
@@ -307,10 +478,13 @@ Public Class ProjectVM
       Dim nLineWidth As Integer = 1
       nLineWidth = GetPrivateProfileInt(S_SCENE, K_LINEWIDTH, nLineWidth)
       m_ProjectScene.SetLineWidth(nLineWidth)
-      ' imposto colore di evidenziazione
+      ' imposto colori di evidenziazione
       Dim MarkColor As New Color3d(255, 255, 0)
       GetPrivateProfileColor(S_SCENE, K_MARK, MarkColor)
       m_ProjectScene.SetMarkMaterial(MarkColor)
+      Dim Mark2Color As New Color3d(255, 64, 64)
+      GetPrivateProfileColor(S_SCENE, K_MARK2, Mark2Color)
+      m_ProjectScene.SetMark2Material(Mark2Color)
       ' imposto colore per superfici selezionate
       Dim SelSurfColor As New Color3d(255, 255, 192)
       GetPrivateProfileColor(S_SCENE, K_SELSURF, SelSurfColor)
@@ -1099,8 +1273,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 
@@ -1118,14 +1292,12 @@ Public Class ProjectVM
                   EgtGetPlaneSnapPoint(e.Location, Vector3d.Z_AX, TableRef.z, ptCurr)
                   DispositionUtility.VtHookFinder(nFixtureId, ptCurr)
                   Exit While
-               ElseIf sName.Contains(DispositionUtility.MOBILE) Then
+               ElseIf DispositionUtility.VerifyTableAxis(nFixtureId) Then
-                  Dim sInfo As String = ""
+                  m_SelType = DispositionUtility.SelType.BARS
-                  If EgtGetInfo(EgtGetParent(nId), "MDir", sInfo) Then
+                  m_nIdToSel = nFixtureId
-                     m_SelType = DispositionUtility.SelType.BARS
+                  ' Drag possibile
-                     m_nIdToSel = EgtGetParent(nId)
+                  m_bDrag = True
-                     ' Drag possibile
+                  Exit While
-                     m_bDrag = True
-                  End If
                End If
             Case SceneSelTypeOpt.RAWPART, SceneSelTypeOpt.RAWPARTWITHFIXTURE
                Dim nRawPartId As Integer = EgtGetParent(nId)
@@ -1187,7 +1359,6 @@ 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
@@ -1390,7 +1561,7 @@ Public Class ProjectVM
          If nFac <> -1 Then
             ' Visualizzo la normale e il contorno della faccia
             Analyze.CreateAnalyzeGroup()
-            Analyze.CreateNormal(nId, nFac)
+            Analyze.CreateFacetNormal(nId, nFac)
             Analyze.CreateFacetLoops(nId, nFac)
             ' Recupero i dati (in globale o griglia a seconda della impostazione)
             Dim ptC As Point3d
@@ -1405,6 +1576,27 @@ Public Class ProjectVM
                                  " / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2)
             Map.refStatusBarVM.NotifyStatusOutput(sOut)
          End If
+         ' Se Regione, visualizzo dati parte toccata
+      ElseIf EgtGetType(nId) = GDB_TY.SRF_FRGN Then
+         Dim nChk As Integer = nSub
+         If nChk >= 0 AndAlso nChk < EgtSurfFrChunkCount(nId) Then
+            ' Visualizzo la normale e il contorno della parte
+            Analyze.CreateAnalyzeGroup()
+            Analyze.CreateChunkNormal(nId, nChk)
+            Analyze.CreateChunkLoops(nId, nChk)
+            ' Recupero i dati (in globale o griglia a seconda della impostazione)
+            Dim ptC As Point3d
+            Dim vtN As Vector3d
+            EgtSurfFrChunkCenter(nId, nChk, If(m_bCPlaneTypePos, GDB_ID.GRID, GDB_ID.ROOT), ptC, vtN)
+            Dim dLen, dPhi, dTheta As Double
+            vtN.ToSpherical(dLen, dTheta, dPhi)
+            ' Emetto info sulla barra di stato
+            Dim sOut As String = "Chunk " + nChk.ToString() +
+                                 " : C(" + LenToString(ptC.x, 3) + "," + LenToString(ptC.y, 3) + "," + LenToString(ptC.z, 3) + ")" +
+                                   " N(" + DoubleToString(vtN.x, 4) + "," + DoubleToString(vtN.y, 4) + "," + DoubleToString(vtN.z, 4) + ")" +
+                                 " / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2)
+            Map.refStatusBarVM.NotifyStatusOutput(sOut)
+         End If
       End If
       ' Aggiorno la visualizzazione
       EgtDraw()

RightTray/RightTrayV.xaml

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

Special-BeamWall/Beam.vb

@@ -57,7 +57,13 @@ Module Beam
       Map.refManageLayerExpanderVM.SelectIdInObjTreeNoMark(EgtGetCurrLayer())
       If EgtGetCurrMachGroup() <> GDB_ID.NULL Then
          Map.refTopCommandBarVM.SetMachiningMode()
+         ' Se simulazione
          If bOk And nFlag = 2 Then
+            ' Se da TS3 e non pezzo da Vista, impedisco di fare altro
+            If bBtl AndAlso sFile.IndexOf( "Part_", StringComparison.InvariantCulture) = -1 Then
+               Map.refSimulationExpanderVM.bOnlySimulation = True
+            End If
+            ' Vado in simulazione
             Map.refSimulationExpanderVM.Simulation_IsExpanded = True
          End If
       End If

Special-BeamWall/Wall.vb

@@ -58,7 +58,13 @@ Module Wall
       Map.refManageLayerExpanderVM.SelectIdInObjTreeNoMark(EgtGetCurrLayer())
       If EgtGetCurrMachGroup() <> GDB_ID.NULL Then
          Map.refTopCommandBarVM.SetMachiningMode()
+         ' Se simulazione
          If bOk And nFlag = 2 Then
+            ' Se da TS3 e non pezzo da Vista, impedisco di fare altro
+            If bBtl AndAlso sFile.IndexOf( "Part_", StringComparison.InvariantCulture) = -1 Then
+               Map.refSimulationExpanderVM.bOnlySimulation = True
+            End If
+            ' Vado in simulazione
             Map.refSimulationExpanderVM.Simulation_IsExpanded = True
          End If
       End If

Special-Doors/TableUtility.vb

@@ -428,18 +428,19 @@ Module TableUtility
                Dim CurrMachining As MTableMachiningGridBoxItem = SelectedTable.ActiveMachinesList(MachineIndex).MachiningList(MachiningIndex)
                If CurrMachining.GroupId <> CurrGroupId And Not String.IsNullOrWhiteSpace(CurrMachining.PropertyPar) Then
                   Dim CurrentLine As String = "   { MachId = '" & SelectedTable.ActiveMachinesList(MachineIndex).MachId & "', Group = " & (CurrMachining.GroupId * 100).ToString &
-                                              ", Property = " & CurrMachining.PropertyPar & " }"
+                                              ", Property = " & CurrMachining.PropertyPar & " } ,"
-                  If CurrMachining.GroupId <> LastGroupId Then
+                  'If CurrMachining.GroupId <> LastGroupId Then
-                     CurrentLine &= " ,"
+                  '   CurrentLine &= " ,"
-                  End If
+                  'End If
                   NewTableFileContent.Add(CurrentLine)
                   CurrGroupId = CurrMachining.GroupId
-               ElseIf CurrMachining.GroupId <> CurrGroupId And CurrMachining.GroupId = LastGroupId Then
+                  'ElseIf MachineIndex = SelectedTable.ActiveMachinesList.Count - 1 AndAlso CurrMachining.GroupId <> CurrGroupId And CurrMachining.GroupId = LastGroupId Then
-                  NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c)
+                  '   NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c)
                End If
             Next
          End If
       Next
+      NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c)
    End Sub
 
    Private Sub ReorderMachiningIndex(SelectedTable As MTableListBoxItem)

TopCommandBar/TopCommandBarV.xaml

@@ -56,7 +56,7 @@
       <Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
    </Button>
    <Button Command="{Binding SendFeedbackCommand}" ToolTip="{Binding SendFeedbackToolTip}"
-            IsEnabled="{Binding SaveIsEnabled}">
+            IsEnabled="{Binding SendFeedbackIsEnabled}">
       <Image Source="/Resources/TopCommandBar/Send.png" Height="22" Margin="3,0,3,0" />
    </Button>
    <UniformGrid Rows="1">

TopCommandBar/TopCommandBarVM.vb

@@ -169,10 +169,17 @@ Public Class TopCommandBarVM
          If value <> m_SaveIsEnabled Then
             m_SaveIsEnabled = value
             OnPropertyChanged("SaveIsEnabled")
+            OnPropertyChanged("SendFeedbackIsEnabled")
          End If
       End Set
    End Property
 
+   Public ReadOnly Property SendFeedbackIsEnabled As Boolean
+      Get
+         Return m_SaveIsEnabled OrElse Not EgtGetModified()
+      End Get
+   End Property
+
 #End Region    ' Fields & Properties
 
 #Region "Get & Set"
@@ -213,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( EgtGetLastMachGroup(), sMachineName) Then
+            if EgtGetMachGroupMachineName( EgtGetFirstMachGroup(), sMachineName) Then
                Map.refMachinePanelVM.SelectedMachine = Map.refMachinePanelVM.MachinesList.FirstOrDefault(Function(x) x.Name = sMachineName)
             End If
          End If
@@ -234,7 +241,7 @@ Public Class TopCommandBarVM
             If Not IsNothing(Map.refDoorPanelVM) Then Map.refDoorPanelVM.MTableIsEnabled(bIsEnabled)
             If Not IsNothing(Map.refSpecialPanelVM) Then Map.refSpecialPanelVM.SpecialPanelIsEnabled(bIsEnabled)
          End If
-            Else
+      Else
          ' Deseleziono tutto
          EgtDeselectAll()
          ' Pulisco lista e geometria faccette di superfici di lavorazione corrente

Utility/Analyze.vb

@@ -37,7 +37,7 @@ Module Analyze
       Return True
    End Function
 
-   Function CreateNormal( nId As Integer, nFac As Integer) As Boolean
+   Function CreateFacetNormal( nId As Integer, nFac As Integer) As Boolean
       If m_AnaGrpId = GDB_ID.NULL Then Return False
       Dim bEnMod As Boolean = EgtGetEnableModified()
       EgtDisableModified()
@@ -66,6 +66,35 @@ Module Analyze
       Return True
    End Function
 
+   Function CreateChunkNormal( nId As Integer, nChk As Integer) As Boolean
+      If m_AnaGrpId = GDB_ID.NULL Then Return False
+      Dim bEnMod As Boolean = EgtGetEnableModified()
+      EgtDisableModified()
+      Dim ptC As Point3d
+      Dim vtN As Vector3d
+      If EgtSurfFrChunkCenter( nId, nChk, GDB_ID.ROOT, ptC, vtN) Then
+         Dim nNormId As Integer = EgtCreateGeoVector( m_AnaGrpId, 50 * vtN, ptC, GDB_RT.GLOB)
+         EgtSetColor( nNormId, New Color3d( 255, 0,0))
+      End If
+      If bEnMod Then EgtEnableModified()
+      Return True
+   End Function
+
+   Function CreateChunkLoops( nId As Integer, nChk As Integer) As Boolean
+      If m_AnaGrpId = GDB_ID.NULL Then Return False
+      Dim bEnMod As Boolean = EgtGetEnableModified()
+      EgtDisableModified()
+      Dim nCount As Integer
+      Dim nFirstId As Integer = EgtExtractSurfFrChunkLoops( nId, nChk, m_AnaGrpId, nCount)
+      If nFirstId <> GDB_ID.NULL Then
+         For nCrvId As Integer = nFirstId To nFirstId + nCount - 1
+            EgtSetColor( nCrvId, New Color3d( 255, 0,0))
+         Next
+      End If
+      If bEnMod Then EgtEnableModified()
+      Return True
+   End Function
+
    Function CreateCurveCompoPntNbrs( nId As Integer) As Boolean
       If m_AnaGrpId = GDB_ID.NULL Then Return False
       Dim bEnMod As Boolean = EgtGetEnableModified()

Utility/Dictionary.xaml

@@ -38,6 +38,7 @@
    <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"/>-->
 
@@ -458,8 +459,12 @@
    <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}}">
       <Setter Property="Margin" Value="10,0,0,0"/>
    </Style>
@@ -1149,41 +1154,41 @@
       </Setter>
    </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- GroupBox with margins -->
+   <!-- GroupBox with margins -->
 
-    <Style x:Key="GroupBoxStyle_Margin" TargetType="{x:Type GroupBox}">
+   <Style x:Key="GroupBoxStyle_Margin" TargetType="{x:Type GroupBox}">
-        <Setter Property="Margin" Value="3,0"/>
+      <Setter Property="Margin" Value="3,0"/>
-    </Style>
+   </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- GroupBox with margins and no header -->
+   <!-- GroupBox with margins and no header -->
 
-    <Style x:Key="GroupBoxStyle_NoHeader" TargetType="{x:Type GroupBox}">
+   <Style x:Key="GroupBoxStyle_NoHeader" TargetType="{x:Type GroupBox}">
-        <Setter Property="Margin" Value="3,0"/>
+      <Setter Property="Margin" Value="3,0"/>
-        <Setter Property="BorderBrush" Value="#FFD5DFE5"/>
+      <Setter Property="BorderBrush" Value="#FFD5DFE5"/>
-        <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
+      <Setter Property="Template">
-            <Setter.Value>
+         <Setter.Value>
-                <ControlTemplate TargetType="{x:Type GroupBox}">
+            <ControlTemplate TargetType="{x:Type GroupBox}">
-                    <Grid SnapsToDevicePixels="True">
+               <Grid SnapsToDevicePixels="True">
-                        <Grid.ColumnDefinitions>
+                  <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="6"/>
+                     <ColumnDefinition Width="6"/>
-                            <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
+                     <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="6"/>
+                     <ColumnDefinition Width="6"/>
-                        </Grid.ColumnDefinitions>
+                  </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
+                  <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
+                     <RowDefinition Height="*"/>
-                            <RowDefinition Height="6"/>
+                     <RowDefinition Height="6"/>
-                        </Grid.RowDefinitions>
+                  </Grid.RowDefinitions>
-                        <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
+                  <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
-                        <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
+                  <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
-                            <!--<Border.OpacityMask>
+                     <!--<Border.OpacityMask>
                                     <MultiBinding ConverterParameter="7" UpdateSourceTrigger="Default">
                                         <MultiBinding.Converter>
                                             <BorderGapMaskConverter/>
@@ -1193,60 +1198,72 @@
                                         <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
                                     </MultiBinding>
                                 </Border.OpacityMask>-->
-                            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
+                     <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
-                                <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
+                        <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
-                            </Border>
+                     </Border>
-                        </Border>
+                  </Border>
-                        <Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2">
+                  <Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2">
-                            <ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                     <ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
+                  </Border>
-                        <ContentPresenter Grid.ColumnSpan="2" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" ContentStringFormat="{TemplateBinding ContentStringFormat}" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  <ContentPresenter Grid.ColumnSpan="2" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" ContentStringFormat="{TemplateBinding ContentStringFormat}" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Grid>
+               </Grid>
-                </ControlTemplate>
+            </ControlTemplate>
-            </Setter.Value>
+         </Setter.Value>
-        </Setter>
+      </Setter>
-    </Style>
+   </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- Margin for TextBlocks and TextBoxes in MachiningParameterExpander not from EgtWPFLib5 -->
+   <!-- Margin for TextBlocks and TextBoxes in MachiningParameterExpander not from EgtWPFLib5 -->
 
-    <Style x:Key="MPExpander_DepthTxBlMargin" TargetType="{x:Type TextBlock}">
+   <Style x:Key="MPExpander_DepthTxBlMargin" TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="1,3,0,0"/>
+      <Setter Property="Margin" Value="1,3,0,0"/>
-    </Style>
+   </Style>
 
-    <Style x:Key="MPExpander_DepthTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
+   <Style x:Key="MPExpander_DepthTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
-        <Setter Property="Margin" Value="-1,0,0,0"/>
+      <Setter Property="Margin" Value="-1,0,0,0"/>
-    </Style>
+   </Style>
 
-    <Style x:Key="MPExpander_UserNotesTxBlMargin" TargetType="{x:Type TextBlock}">
+   <Style x:Key="MPExpander_UserNotesTxBlMargin" TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="1,0,0,0"/>
+      <Setter Property="Margin" Value="1,0,0,0"/>
-    </Style>
+   </Style>
 
     <Style x:Key="MPExpander_UserNotesTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
         <Setter Property="Margin" Value="-1,0,0,0"/>
     </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- Margin for UserControls in MachiningParameterExpander from EgtWPFLib5 -->
+   <!-- Margin for UserControls in MachiningParameterExpander from EgtWPFLib5 -->
 
-    <Style x:Key="StringParamV_Margin" TargetType="{x:Type EgtWPFLib5:StringParamV}">
+   <Style x:Key="StringParamV_Margin" TargetType="{x:Type EgtWPFLib5:StringParamV}">
-        <Setter Property="Margin" Value="-3"/>
+      <Setter Property="Margin" Value="-3"/>
-    </Style>
+   </Style>
 
-    <Style x:Key="ComboParamV_Margin" TargetType="{x:Type EgtWPFLib5:ComboParamV}">
+   <Style x:Key="ComboParamV_Margin" TargetType="{x:Type EgtWPFLib5:ComboParamV}">
-        <Setter Property="Margin" Value="-3"/>
+      <Setter Property="Margin" Value="-3"/>
-    </Style>
+   </Style>
 
-    <Style x:Key="CheckParamV_Margin" TargetType="{x:Type EgtWPFLib5:CheckParamV}">
+   <Style x:Key="CheckParamV_Margin" TargetType="{x:Type EgtWPFLib5:CheckParamV}">
-        <Setter Property="Margin" Value="-3"/>
+      <Setter Property="Margin" Value="-3"/>
-    </Style>
+   </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!-- Style Slider -->
+   
+   <Style x:Key="SliderValue_Slider" TargetType="{x:Type Slider}">
+      <Setter Property="Width" Value="235"/>
+      <Setter Property="SmallChange" Value="1"/>
+      <Setter Property="TickPlacement" Value="TopLeft"/>
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="Opacity" Value="0.5"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
 
-   <Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
+<Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="ListBoxItem">
@@ -1265,5 +1282,35 @@
          </Setter.Value>
       </Setter>
    </Style>
+   
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- Style CheckBox -->
+
+   <Style x:Key="ViewTool_CheckBox" TargetType="{x:Type CheckBox}">
+      <Setter Property="Margin"  Value="0,10,0,5"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <!--<Style.Triggers>
+         <Trigger Property="IsChecked" Value="True">
+            <Setter Property="Foreground" Value="#FF50E6FD"/>
+         </Trigger>
+      </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>

Utility/IniFile.vb

@@ -34,6 +34,14 @@ Public Module IniFile
       MACHPATH = 5
    End Enum
 
+   Public Enum VMillSelTypeOpt As Integer
+      LOWER = -2
+      LOW = -1
+      STANDARD = 0
+      HIGH = 1
+      HIGHER = 2
+   End Enum
+
    ' MainWindow Page
    Friend m_nInstance As Integer = 0
    Friend m_nUserLevel As Integer = 1

Utility/MachineModel.vb

@@ -44,12 +44,12 @@ Public Module MachineModel
       If IniFile.IsKeyEnabledAdvancedMachining() AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFFINISHING, 0, m_sCurrMachIniFilePath) <> 0 Then
          ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SURFFINISHING, .TypeName = EgtMsg(31211)})
       End If
-      If IniFile.IsKeyEnabledAdvancedMachining() AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_5AXMACHINING, 0, m_sCurrMachIniFilePath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY._5AXMACHINING, .TypeName = EgtMsg(31213)})
-      End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_WATERJETTING, 0, m_sCurrMachIniFilePath) <> 0 Then
          ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.WATERJETTING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 12)})
       End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_5AXMILLING, 0, m_sCurrMachIniFilePath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.FIVEAXISMILLING, .TypeName = EgtMsg(31213)})
+      End If
       Return ActiveMachiningsFamiliesList.ToArray
    End Function
 
@@ -88,12 +88,12 @@ Public Module MachineModel
       If IniFile.IsKeyEnabledAdvancedMachining() AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFFINISHING, 0, sMachineName) <> 0 Then
          ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SURFFINISHING, .TypeName = EgtMsg(31211)})
       End If
-      If IniFile.IsKeyEnabledAdvancedMachining() AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_5AXMACHINING, 0, sMachineName) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY._5AXMACHINING, .TypeName = EgtMsg(31213)})
-      End If
       If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_WATERJETTING, 0, sMachineName) <> 0 Then
          ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.WATERJETTING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 12)})
       End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_5AXMILLING, 0, sMachineName) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.FIVEAXISMILLING, .TypeName = EgtMsg(31213)})
+      End If
       Return ActiveMachiningsFamiliesList.ToArray
    End Function
 

Utility/Map.vb

@@ -34,6 +34,7 @@ Module Map
    Private m_refWallPanelVM As WallPanelVM
    Private m_refBeamWallPanelVM As BeamWallPanelVM
    Private m_refGunStockPanelVM As GunStockPanelVM
+   Private m_refMachiningParameterExpanderVM As MachiningParameterExpanderVM
 
 #Region "Get"
 
@@ -187,6 +188,11 @@ Module Map
          Return m_refGunStockPanelVM
       End Get
    End Property
+   Public ReadOnly Property refMachiningParameterExpanderVM As MachiningParameterExpanderVM
+      Get
+         Return m_refMachiningParameterExpanderVM
+      End Get
+   End Property
 
 #End Region    ' Get
 
@@ -309,6 +315,10 @@ Module Map
       m_refGunStockPanelVM = GunStockPanelVM
       Return Not IsNothing(m_refGunStockPanelVM)
    End Function
+   Friend Function SetRefMachiningParameterExpanderVM(MachiningParameterExpanderVM As MachiningParameterExpanderVM) As Boolean
+      m_refMachiningParameterExpanderVM = MachiningParameterExpanderVM
+      Return Not IsNothing(m_refMachiningParameterExpanderVM)
+   End Function
 
 #End Region    ' Set
 
@@ -327,7 +337,8 @@ Module Map
              Not IsNothing(m_refOperationParametersExpanderVM) AndAlso Not IsNothing(m_refMachiningTreeExpanderVM) AndAlso
              Not IsNothing(LibMap.refMachGroupPanelVM) AndAlso Not IsNothing(m_refInstrumentPanelVM) AndAlso Not IsNothing(m_refManageLayerExpanderVM) AndAlso
              Not IsNothing(m_refInputExpanderVM) AndAlso Not IsNothing(m_refShowPanelVM) AndAlso Not IsNothing(m_refInfoExpanderVM) AndAlso
-             Not IsNothing(m_refDrawPanelVM) AndAlso Not IsNothing(m_refProjectV) AndAlso Not IsNothing(m_refDoorPanelVM) AndAlso Not IsNothing(m_refSpecialPanelVM)
+             Not IsNothing(m_refDrawPanelVM) AndAlso Not IsNothing(m_refProjectV) AndAlso Not IsNothing(m_refDoorPanelVM) AndAlso Not IsNothing(m_refSpecialPanelVM) AndAlso
+             Not IsNothing(m_refMachiningParameterExpanderVM)
    End Function
 
 #End Region    ' Init

Utility/TMDbParamVisibility.vb

@@ -27,6 +27,8 @@
    Friend Chiseling(63) As Visibility
    Friend SurfFinishing(63) As Visibility
    Friend WaterJetting(63) As Visibility
+   Friend FiveAxMachining(63) As Visibility
+   Friend SurfRoughing(63) As Visibility
 
    ' Array che contiene il valore della proprietà visibility per ogni campo delle operazioni
    Friend OperationDisposition(49) As Visibility
@@ -1056,6 +1058,138 @@
       OperationDisposition(14) = Visibility.Collapsed
       OperationDisposition(15) = Visibility.Collapsed
 
+      ' Parametri FiveAxMachining
+      FiveAxMachining(0) = Visibility.Visible                          ' Invert
+      FiveAxMachining(1) = Visibility.Collapsed                        ' LeaveTab
+      FiveAxMachining(2) = Visibility.Collapsed                        ' WorkSide
+      FiveAxMachining(3) = Visibility.Collapsed                        ' HeadSide
+      FiveAxMachining(4) = Visibility.Collapsed                        ' LeadInType
+      FiveAxMachining(5) = Visibility.Collapsed                        ' ExtLinkType
+      FiveAxMachining(6) = Visibility.Collapsed                        ' LeadOutType
+      FiveAxMachining(7) = Visibility.Collapsed                        ' CurveUse
+      FiveAxMachining(8) = Visibility.Collapsed                        ' StepType
+      FiveAxMachining(9) = Visibility.Collapsed                        ' LeadLinkType
+      FiveAxMachining(10) = Visibility.Visible                         ' Speed
+      FiveAxMachining(11) = Visibility.Visible                         ' Feed
+      FiveAxMachining(12) = Visibility.Visible                         ' StartFeed
+      FiveAxMachining(13) = Visibility.Visible                         ' EndFeed
+      FiveAxMachining(14) = Visibility.Visible                         ' TipFeed
+      FiveAxMachining(15) = Visibility.Visible                         ' OffSr
+      FiveAxMachining(16) = Visibility.Visible                         ' OffSl
+      FiveAxMachining(17) = Visibility.Collapsed                       ' SideAngle
+      FiveAxMachining(18) = Visibility.Collapsed                       ' Approx
+      FiveAxMachining(19) = Visibility.Visible                         ' StartPos
+      FiveAxMachining(20) = Visibility.Collapsed                       ' StartSlowLen
+      FiveAxMachining(21) = Visibility.Collapsed                       ' EndSlowLen
+      FiveAxMachining(22) = Visibility.Collapsed                       ' ThroughAddlen
+      FiveAxMachining(23) = Visibility.Collapsed                       ' StepPar
+      FiveAxMachining(24) = Visibility.Collapsed                       ' Returnpos
+      FiveAxMachining(25) = Visibility.Collapsed                       ' TabLen
+      FiveAxMachining(26) = Visibility.Collapsed                       ' TabDist
+      FiveAxMachining(27) = Visibility.Collapsed                       ' TabHeight
+      FiveAxMachining(28) = Visibility.Collapsed                       ' TabAngle
+      FiveAxMachining(29) = Visibility.Collapsed                       ' LiTang
+      FiveAxMachining(30) = Visibility.Collapsed                       ' LiPerp
+      FiveAxMachining(31) = Visibility.Collapsed                       ' LiElev
+      FiveAxMachining(32) = Visibility.Collapsed                       ' LiCompLen
+      FiveAxMachining(33) = Visibility.Collapsed                       ' LoTang
+      FiveAxMachining(34) = Visibility.Collapsed                       ' LoPerp
+      FiveAxMachining(35) = Visibility.Collapsed                       ' LoElev
+      FiveAxMachining(36) = Visibility.Collapsed                       ' LoCompLen
+      FiveAxMachining(37) = Visibility.Collapsed                       ' StartAddLen
+      FiveAxMachining(38) = Visibility.Collapsed                       ' EndAddLen
+      FiveAxMachining(39) = Visibility.Collapsed                       ' StepExtArc
+      FiveAxMachining(40) = Visibility.Collapsed                       ' StepIntArc
+      FiveAxMachining(41) = Visibility.Collapsed                       ' SideStep
+      FiveAxMachining(42) = Visibility.Collapsed                       ' VertFeed
+      FiveAxMachining(43) = Visibility.Visible                         ' Name
+      FiveAxMachining(44) = Visibility.Visible                         ' Tool
+      FiveAxMachining(45) = Visibility.Visible                         ' DepthStr
+      FiveAxMachining(46) = Visibility.Visible                         ' UserNotes
+      FiveAxMachining(47) = Visibility.Collapsed                       ' OverLapStr
+      FiveAxMachining(48) = Visibility.Collapsed                       ' OffsetStr
+      FiveAxMachining(49) = Visibility.Visible                         ' SubType
+      FiveAxMachining(50) = Visibility.Visible                         ' SelectedSolChoiceType
+      FiveAxMachining(51) = Visibility.Visible                         ' AxRotRef
+      FiveAxMachining(52) = Visibility.Visible                         ' BlockedAxesRef
+      FiveAxMachining(53) = Visibility.Collapsed                       ' FaceUseType
+      FiveAxMachining(54) = Visibility.Visible                         ' InvertToolDir
+      FiveAxMachining(55) = Visibility.Collapsed                       ' Expander LeadIn
+      FiveAxMachining(56) = Visibility.Collapsed                       ' Expander LeadOut
+      FiveAxMachining(57) = Visibility.Collapsed                       ' ApproxGen
+      FiveAxMachining(58) = Visibility.Collapsed                       ' OscEnable
+      FiveAxMachining(59) = Visibility.Collapsed                       ' OscHeight
+      FiveAxMachining(60) = Visibility.Collapsed                       ' OscRampLen
+      FiveAxMachining(61) = Visibility.Collapsed                       ' OscFlatLen
+      FiveAxMachining(62) = Visibility.Collapsed                       ' TabMax
+      FiveAxMachining(63) = Visibility.Collapsed                       ' TabMin
+
+      ' Parametri SurfRoughing
+      SurfRoughing(0) = Visibility.Visible                      ' Invert
+      SurfRoughing(1) = Visibility.Collapsed                    ' LeaveTab
+      SurfRoughing(2) = Visibility.Collapsed                    ' WorkSide
+      SurfRoughing(3) = Visibility.Collapsed                    ' HeadSide
+      SurfRoughing(4) = Visibility.Visible                      ' LeadInType
+      SurfRoughing(5) = Visibility.Collapsed                    ' ExtLinkType
+      SurfRoughing(6) = Visibility.Visible                      ' LeadOutType
+      SurfRoughing(7) = Visibility.Collapsed                    ' CurveUse
+      SurfRoughing(8) = Visibility.Collapsed                    ' StepType
+      SurfRoughing(9) = Visibility.Visible                      ' LeadLinkType
+      SurfRoughing(10) = Visibility.Visible                     ' Speed
+      SurfRoughing(11) = Visibility.Visible                     ' Feed
+      SurfRoughing(12) = Visibility.Visible                     ' StartFeed
+      SurfRoughing(13) = Visibility.Visible                     ' EndFeed
+      SurfRoughing(14) = Visibility.Visible                     ' TipFeed
+      SurfRoughing(15) = Visibility.Visible                     ' OffSr
+      SurfRoughing(16) = Visibility.Collapsed                   ' OffSl
+      SurfRoughing(17) = Visibility.Visible                     ' SideAngle
+      SurfRoughing(18) = Visibility.Visible                     ' Approx
+      SurfRoughing(19) = Visibility.Visible                     ' StartPos
+      SurfRoughing(20) = Visibility.Collapsed                   ' StartSlowLen
+      SurfRoughing(21) = Visibility.Collapsed                   ' EndSlowLen
+      SurfRoughing(22) = Visibility.Collapsed                   ' ThroughAddlen
+      SurfRoughing(23) = Visibility.Collapsed                   ' StepPar
+      SurfRoughing(24) = Visibility.Collapsed                   ' Returnpos
+      SurfRoughing(25) = Visibility.Collapsed                   ' TabLen
+      SurfRoughing(26) = Visibility.Collapsed                   ' TabDist
+      SurfRoughing(27) = Visibility.Collapsed                   ' TabHeight
+      SurfRoughing(28) = Visibility.Collapsed                   ' TabAngle
+      SurfRoughing(29) = Visibility.Visible                     ' LiTang
+      SurfRoughing(30) = Visibility.Visible                     ' LiPerp
+      SurfRoughing(31) = Visibility.Collapsed                   ' LiElev
+      SurfRoughing(32) = Visibility.Collapsed                   ' LiCompLen
+      SurfRoughing(33) = Visibility.Visible                     ' LoTang
+      SurfRoughing(34) = Visibility.Visible                     ' LoPerp
+      SurfRoughing(35) = Visibility.Collapsed                   ' LoElev
+      SurfRoughing(36) = Visibility.Collapsed                   ' LoCompLen
+      SurfRoughing(37) = Visibility.Collapsed                   ' StartAddLen
+      SurfRoughing(38) = Visibility.Collapsed                   ' EndAddLen
+      SurfRoughing(39) = Visibility.Collapsed                   ' StepExtArc
+      SurfRoughing(40) = Visibility.Collapsed                   ' StepIntArc
+      SurfRoughing(41) = Visibility.Visible                     ' SideStep
+      SurfRoughing(42) = Visibility.Collapsed                   ' VertFeed
+      SurfRoughing(43) = Visibility.Visible                     ' Name
+      SurfRoughing(44) = Visibility.Visible                     ' Tool
+      SurfRoughing(45) = Visibility.Visible                     ' DepthStr
+      SurfRoughing(46) = Visibility.Visible                     ' UserNotes
+      SurfRoughing(47) = Visibility.Visible                     ' OverLapStr
+      SurfRoughing(48) = Visibility.Collapsed                   ' OffsetStr
+      SurfRoughing(49) = Visibility.Visible                     ' SubType
+      SurfRoughing(50) = Visibility.Visible                     ' SelectedSolChoiceType
+      SurfRoughing(51) = Visibility.Visible                     ' AxRotRef
+      SurfRoughing(52) = Visibility.Visible                     ' BlockedAxesRef
+      SurfRoughing(53) = Visibility.Collapsed                   ' FaceUseType
+      SurfRoughing(54) = Visibility.Collapsed                   ' InvertToolDir
+      SurfRoughing(55) = Visibility.Visible                     ' Expander LeadIn
+      SurfRoughing(56) = Visibility.Visible                     ' Expander LeadOut
+      SurfRoughing(57) = Visibility.Visible                     ' ApproxGen
+      SurfRoughing(58) = Visibility.Collapsed                   ' OscEnable
+      SurfRoughing(59) = Visibility.Collapsed                   ' OscHeight
+      SurfRoughing(60) = Visibility.Collapsed                   ' OscRampLen
+      SurfRoughing(61) = Visibility.Collapsed                   ' OscFlatLen
+      SurfRoughing(62) = Visibility.Collapsed                   ' TabMax
+      SurfRoughing(63) = Visibility.Collapsed                   ' TabMin
+
    End Sub
 
 End Module

WinFormPluginControl/WinFormPluginControlV.xaml

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
+      <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+         <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
+            <!-- UAC Manifest Options
              If you want to change the Windows User Account Control level replace the 
              requestedExecutionLevel node with one of the following.
 
@@ -16,49 +16,49 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+            <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
+         </requestedPrivileges>
-    </security>
+      </security>
-  </trustInfo>
+   </trustInfo>
 
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
+      <application>
-      <!-- A list of the Windows versions that this application has been tested on
+         <!-- A list of the Windows versions that this application has been tested on
            and is designed to work with. Uncomment the appropriate elements
            and Windows will automatically select the most compatible environment. -->
 
-      <!-- Windows Vista -->
+         <!-- Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
+         <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
 
-      <!-- Windows 7 -->
+         <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+         <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
 
-      <!-- Windows 8 -->
+         <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+         <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
 
-      <!-- Windows 8.1 -->
+         <!-- Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+         <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
 
-      <!-- Windows 10 -->
+         <!-- Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+         <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
 
-    </application>
+      </application>
-  </compatibility>
+   </compatibility>
 
-  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+   <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
        DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
        to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
        also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
-  <!--
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-    </windowsSettings>
-  </application>
-  -->
 
-  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+   <application xmlns="urn:schemas-microsoft-com:asm.v3">
-  <!--
+      <windowsSettings>
+         <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      </windowsSettings>
+   </application>
+
+
+   <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+   <!--
   <dependency>
     <dependentAssembly>
       <assemblyIdentity