-gestione finestra con griglia dinamica

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

AboutBoxWindow/AboutBoxView.xaml.vb

@@ -14,11 +14,23 @@ Public Class AboutBoxWndV
       Dim sLeftDays As String = ""
       Dim nLeftDays As Integer 
       if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
+      Dim sAssStatus As String = " discontinued"
+      Dim nAssLeftDays As Integer
+      If EgtGetKeyAssLeftDays( nAssLeftDays) And nAssLeftDays >= 0 Then
+         If nAssLeftDays > 30 then
+            sAssStatus = "expires within " & nAssLeftDays.ToString() & " days"
+         Else If nAssLeftDays > 0 then
+            sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days"
+         Else  
+            sAssStatus = "to be renewed by today"
+         End If
+      End If
       sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") 
       sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
                "  Inst" & IniFile.m_nInstance.ToString() &
                " Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" &  Map.refMainWindowVM.DebugLevel().ToString() & Environment.NewLine
       sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
+      sInfo &= "SupportPlane " & sAssStatus & Environment.NewLine
       sInfo &= "DataRoot " & IniFile.m_sDataRoot & Environment.NewLine
       If IniFile.m_ProjectMode <> ProjectModeOpt.ONLYDRAW Then
          sInfo &= "MachinesRoot " & IniFile.m_sMachinesRoot & Environment.NewLine

Constants/ConstIni.vb

@@ -47,7 +47,6 @@ Module ConstIni
 
    Public Const S_LUA As String = "Lua"
    Public Const K_LIBSDIR As String = "LibsDir"
-   Public Const K_LIBSDIR64 As String = "LibsDir64"
    Public Const K_BASELIB As String = "BaseLib"
    Public Const K_BWSIM As String = "BWSim"
 
@@ -70,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"
@@ -109,6 +109,7 @@ Module ConstIni
    Public Const K_CNCFLAG As String = "CncFlag"
    Public Const K_BTLFLAG As String = "BtlFlag"
    Public Const K_BTLAUXDIR As String = "BtlAuxDir"
+   Public Const K_ADVFLAG As String = "AdvFlag"
 
    Public Const S_EXPORT As String = "Export"
    Public Const K_DXFFLAG As String = "DxfFlag"
@@ -123,7 +124,6 @@ Module ConstIni
    Public Const S_BEAM As String = "Beam"
    Public Const K_BEAMENABLE As String = "BtlEnable"
    Public Const K_BEAMBASEDIR As String = "BaseDir"
-   Public Const K_BEAMBASEDIR64 As String = "BaseDir64"
    Public Const K_BEAMBTLEXEC As String = "BtlExec"
    Public Const K_BEAMBWEEXEC As String = "BweExec"
    Public Const K_BEAMMACHINES As String = "Machines"
@@ -132,7 +132,6 @@ Module ConstIni
    Public Const S_WALL As String = "Wall"
    Public Const K_WALLENABLE As String = "BtlEnable"
    Public Const K_WALLBASEDIR As String = "BaseDir"
-   Public Const K_WALLBASEDIR64 As String = "BaseDir64"
    Public Const K_WALLBTLEXEC As String = "BtlExec"
    Public Const K_WALLBWEEXEC As String = "BweExec"
    Public Const K_WALLBUTTON As String = "Button"
@@ -172,7 +171,6 @@ Module ConstIni
    Public Const S_MACH As String = "Mach"
    Public Const K_MACHINESDIR As String = "MachinesDir"
    Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
-   Public Const K_TOOLMAKERSDIR64 As String = "ToolMakersDir64"
    Public Const K_CURRMACH As String = "CurrMach"
    Public Const K_SELGEOMSAWING As String = "SelGeomSawing"
    Public Const K_SELGEOMDRILLING As String = "SelGeomDrilling"
@@ -184,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

@@ -14,20 +14,47 @@
             <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"/>
+               <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="{Binding Line2PToolTip}" Style="{StaticResource DrawPanelButton}"
+                     <Button ToolTip="Riferimento" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding PointReferenceCommand}">
+                        <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Linea 2 Punti" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding Line2PBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Line2P+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Linea 2 Punti con Continuazione" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding Line2PContinuationCommand}">
                         <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
                      </Button>
-            <Button ToolTip="{Binding LinePDLToolTip}" Style="{StaticResource DrawPanelButton}"
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Linea Punto Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
                     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"
@@ -39,11 +66,19 @@
                     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"
                     Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/ArcPDP+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Linea Punto Vettore Direzione Lunghezza" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding LinePDLVectorCommand}">
                         <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
                      </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
             <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
                     Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
@@ -74,16 +109,58 @@
                     Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Quota Lineare" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
-               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
+                    Command="{Binding LinearDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
+               <Image Source="/Resources/DrawPanel/LinearDimension+.png" Stretch="Uniform"/>
-            </Button>
+               <Button.ContextMenu>
-            <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
-               ToolTipService.ShowOnDisabled="True"
+                     <Button ToolTip="Quota Allineata" Style="{StaticResource DrawPanelButton}"
-               Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+                             Command="{Binding AlignedDimensionCommand}">
                         <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
                      </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Quota Angolare" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding AngularDimensionBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/AngularDimension +.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Quota Angolare Avanzata" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding AlignedDimensionPlusCommand}">
+                        <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Quota Diametrale" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding DiamDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/DiametralDimension+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Quota Radiale" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding RadDimensionCommand}">
+                        <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Testo" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding TextBaseCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Text+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Testo Avanzato" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding TextPlusCommand}">
+                        <Image Source="/Resources/DrawPanel/TextA.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
          </UniformGrid>
       </Expander>
       <Expander Name="Draw3D" Style="{StaticResource ExpanderStyle}" Grid.Row="1"
@@ -92,11 +169,19 @@
             <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"
-               Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding FloorCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               <Image Source="/Resources/DrawPanel/Plane+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Regione Piana" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding RegionCommand}">
                         <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
                      </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
             <Button ToolTip="{Binding ExtrudeToolTip}" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
                     Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
@@ -127,16 +212,32 @@
                     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"
-               Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding SubtractSurfacesCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/SolidSubtractSurf+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Taglia Superficie con Superficie Inversa" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding CutSurfacesCommand}">
                         <Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
                      </Button>
-            <Button ToolTip="{Binding SolidIntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Interseca Superfici e Regioni Piane" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding IntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/SolidIntersectSurf+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Taglia Superficie con Superficie" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding CutSurfCommand}">
                         <Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
                      </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
             <Button ToolTip="{Binding IntersectSurfSurfToolTip}" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
                     Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
@@ -152,11 +253,19 @@
                     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"
-               Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ExplodeSurfaceCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ExplodeSurf+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Esplodi Superfici Mesh in Triangoli" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding ExplodeSurfaceMeshCommand}">
                         <Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
                      </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
             <Button ToolTip="{Binding ExtractSurfFacetToolTip}" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
                     Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
@@ -177,6 +286,19 @@
                     Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="Muovi Vertice di Superficie" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding MoveStmVertexCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/StmMoveVertex+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Muovi Faccia di Superficie" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding MoveStmFacetCommand}">
+                        <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
          </UniformGrid>
       </Expander>
       <Expander Name="Modify" Style="{StaticResource ExpanderStyle}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">
@@ -189,13 +311,24 @@
                     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"
-               Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding ChangeLayerBaseCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ChangeLayer+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Cambia Layer con Trasformazioni" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding ChangeLayerTrasfCommand}">
                         <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
                      </Button>
-            <Button Style="{StaticResource DrawPanelButton}"
+                  </ContextMenu>
-                    Visibility="Hidden"/>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ChangeStatusCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ChangeStatus.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
                     Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
@@ -246,11 +379,23 @@
                     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"
-               Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    Command="{Binding JoinCurveBasCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               <Image Source="/Resources/DrawPanel/JoinCurve+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Unisci Curve creando una Copia" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding JoinCurveCopyCommand}">
                         <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
                      </Button>
+                     <Button ToolTip="Fondi Curve nella Composita" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding JoinCurveCompositeCommand}">
+                        <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
             <Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
                     Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
@@ -266,31 +411,70 @@
                     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"/>
+               <Button.ContextMenu >
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Arco Esplementare" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding ComplementaryArchCommand}">
                         <Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
                      </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
             <Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
                     Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
             </Button>
-             <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="Aggiungi Punto" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
-                Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    Command="{Binding AddPointCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/AddPointCurve+.png" Stretch="Uniform"/>
+               <Button.ContextMenu>
+                  <ContextMenu Style="{StaticResource ContextMenu_Button}">
+                     <Button ToolTip="Trasforma in Arco" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding TrasformArcCommand}">
                         <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
                      </Button>
-             <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                     <Button ToolTip="Chiudi Curva Composita" Style="{StaticResource DrawPanelButton}"
+                             Command="{Binding CloseCurveCommand}">
+                        <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+                     </Button>
+                  </ContextMenu>
+               </Button.ContextMenu>
+            </Button>
+            <Button ToolTip="Rimuovi Punto" Style="{StaticResource DrawPanelButton}"
                     ToolTipService.ShowOnDisabled="True"
-                Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    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="{Binding ApproxCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                     <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 ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    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"
                     Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">

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>
@@ -1002,6 +1016,85 @@
   <ItemGroup>
     <Resource Include="Resources\EgtCAM5_64.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Note\+.png" />
+    <Resource Include="Resources\Note\-.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\AngularDimension.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\DiametralDimension.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\ChangeStatus.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\GridViewPanel\CplaneINVERT.png" />
+  </ItemGroup>
+  <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

GridPanel/GridPanelV.xaml

@@ -6,20 +6,20 @@
       <Button Command="{Binding CPlaneTopCommand}" ToolTip="{Binding CPlaneTopToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
       </Button>
+      <Button Command="{Binding CPlaneBottomCommand}" ToolTip="{Binding CPlaneBottomToolTip}" Style="{StaticResource GridViewPanelButton}">
+         <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+      </Button>
       <Button Command="{Binding CPlaneFrontCommand}" ToolTip="{Binding CPlaneFrontToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneRightCommand}" ToolTip="{Binding CPlaneRightToolTip}" Style="{StaticResource GridViewPanelButton}">
-         <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
-      </Button>
       <Button Command="{Binding CPlaneBackCommand}" ToolTip="{Binding CPlaneBackToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding CPlaneLeftCommand}" ToolTip="{Binding CPlaneLeftToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneBottomCommand}" ToolTip="{Binding CPlaneBottomToolTip}" Style="{StaticResource GridViewPanelButton}">
+      <Button Command="{Binding CPlaneRightCommand}" ToolTip="{Binding CPlaneRightToolTip}" Style="{StaticResource GridViewPanelButton}">
-         <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+         <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding CPlaneElevationCommand}" ToolTip="{Binding CPlaneElevationToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>

GridPanel/GridPanelVM.vb

@@ -12,13 +12,8 @@ Public Class GridPanelVM
    Private m_cmdCPlaneBack As ICommand
    Private m_cmdCPlaneLeft As ICommand
    Private m_cmdCPlaneBottom As ICommand
-   Private m_cmdCPlaneView As ICommand
    Private m_cmdCPlaneElevation As ICommand
    Private m_cmdCPlaneOrigin As ICommand
-   Private m_cmdCPlaneRotate As ICommand
-   Private m_cmdCPlane3P As ICommand
-   Private m_cmdCPlanePerpObj As ICommand
-   Private m_cmdCPlaneObj As ICommand
 
 #Region "ToolTip"
 

LeftTray/LeftTrayV.xaml

@@ -5,5 +5,4 @@
       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
@@ -118,10 +118,12 @@ Public Class MyMachGroupPanelVM
       End If
    End Function
 
-   Private Function ExecScript(sScriptPath As String, nGroupId As Integer, nPartId As Integer) As Boolean
+   Private Function ExecScript(sScriptPath As String, nGroupId As Integer, nPartId As Integer, nInd As Integer, sParts As String) As Boolean
       EgtLuaCreateGlobTable("DISP")
       EgtLuaSetGlobIntVar("DISP.GROUPID", nGroupId)
       EgtLuaSetGlobIntVar("DISP.PARTID", nPartId)
+      EgtLuaSetGlobIntVar("DISP.IND", nInd)
+      EgtLuaSetGlobStringVar("DISP.PARTS", sParts)
       If Not EgtLuaExecFile(sScriptPath) Then
          EgtOutLog("Error executing disposition init script " & sScriptPath)
          MessageBox.Show(EgtMsg(MSG_DISPOSITIONERRORS + 2) & " " & sScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -164,10 +166,25 @@ Public Class MyMachGroupPanelVM
       If bWithScript Then
          ' Rendo corrente il gruppo di lavoro
          EgtSetCurrMachGroup(nGroupId)
-         ' Creo grezzo e posiziono i pezzi
+         ' Recupero i pezzi già inseriti
+         Dim sParts As String = ""
+         Dim nInd As Integer = 0
+         Dim nRawId As Integer = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            Dim nPartId As Integer = EgtGetFirstPartInRawPart( nRawId)
+            While nPartId <> GDB_ID.NULL
+               nInd += 1
+               sParts &= nInd.ToString() & ","
+               nPartId = EgtGetNextPartInRawPart( nPartId)
+            End While
+            nRawId = EgtGetNextRawPart( nRawId)
+         End While 
+         ' Creo grezzi e posiziono i pezzi
          Dim bOk As Boolean = True
+         sParts &= String.Join( ",", PartList)
          For Each Part In PartList
-            If Not ExecScript(sInitScriptPath, nGroupId, Part) Then bOk = False
+            nInd += 1
+            If Not ExecScript(sInitScriptPath, nGroupId, Part, nInd, sParts) Then bOk = False
          Next
          Return bOk
       Else
@@ -196,14 +213,18 @@ Public Class MyMachGroupPanelVM
             Return False
          End If
          If bWithScript Then
-            ' Creo grezzo e posiziono i pezzi
             Dim bOk As Boolean = True
+            ' Creo grezzi e posiziono i pezzi
+            If PartList.Count() > 0 then
+               Dim nInd As Integer = 0
+               Dim sParts As String = String.Join( ",", PartList)
                For Each Part In PartList
-               If Not ExecScript(sInitScriptPath, nGroupId, Part) Then bOk = False
+                  nInd += 1
+                  If Not ExecScript(sInitScriptPath, nGroupId, Part, nInd, sParts) Then bOk = False
                Next
-            ' Gestione ingresso senza pezzi
+            ' altrimenti, ingresso senza pezzi
-            If PartList.Count() = 0 Then
+            Else
-               If Not ExecScript(sInitScriptPath, nGroupId, GDB_ID.NULL) Then bOk = False
+               If Not ExecScript(sInitScriptPath, nGroupId, GDB_ID.NULL, 0, "") Then bOk = False
             End If
             If Not bOk Then
                EgtResetCurrMachGroup()
@@ -401,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

MachOptionsWindow/MachOptionV.xaml

@@ -27,6 +27,7 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
       <UniformGrid Grid.Row="0" Columns="2" Margin="0,0,0,5">
@@ -56,7 +57,12 @@
          </ComboBox>
       </UniformGrid>
 
-      <UniformGrid Grid.Row="4" Columns="2">
+      <UniformGrid Grid.Row="4" Columns="2" Margin="0,0,0,5">
+         <TextBlock Text="{Binding ApproxLinTolMsg}" VerticalAlignment="Center"/>
+         <TextBox Text="{Binding ApproxLinTol}" Height="25" Margin="10,0,0,0"/>
+      </UniformGrid>
+
+      <UniformGrid Grid.Row="5" Columns="2">
          <TextBlock Text="{Binding DefaultSetUpMsg}" VerticalAlignment="Center"/>
          <ComboBox ItemsSource="{Binding ArchivedSetUpList}" Height="25" Margin="10,0,0,0"
             SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>

MachOptionsWindow/MachOptionVM.vb

@@ -48,6 +48,21 @@ Public Class MachOptionVM
       End Set
    End Property
 
+   Private m_sApproxLinTol As String
+   Public Property ApproxLinTol As String
+      Get
+         Return m_sApproxLinTol
+      End Get
+      Set(value As String)
+         Dim dApproxLinTol As Double = 0
+         If StringToLen(value, dApproxLinTol) Then
+            EgtMdbSetGeneralParam(MCH_GP.APPROXLINTOL, dApproxLinTol)
+            EgtMdbSave()
+            m_sApproxLinTol = value
+         End If
+      End Set
+   End Property
+
    Private m_SplitArcsList As New List(Of MCH_SA)({MCH_SA.NEVER, MCH_SA.GEN_PLANE, MCH_SA.NO_XY_PLANE, MCH_SA.ALWAYS})
    Public ReadOnly Property SplitArcsList As List(Of MCH_SA)
       Get
@@ -106,6 +121,11 @@ Public Class MachOptionVM
          Return EgtMsg(MSG_MACHININGOPTIONPAGE + 9)
       End Get
    End Property
+   Public ReadOnly Property ApproxLinTolMsg As String
+      Get
+         Return EgtMsg(6410)         ' Tolleranza di approssimazione
+      End Get
+   End Property
 
    Public ReadOnly Property SplitArcsMsg As String
       Get
@@ -141,6 +161,10 @@ Public Class MachOptionVM
       Dim nVal As Integer = 0
       EgtMdbGetGeneralParam(MCH_GP.SPLITARCS, nVal)
       m_SelectedSplitArcs = DirectCast(nVal, MCH_SA)
+      ' Leggo tolleranza lineare di approssimazione
+      dVal = 0
+      EgtMdbGetGeneralParam(MCH_GP.APPROXLINTOL, dVal)
+      m_sApproxLinTol = LenToString(dVal, 4)
       ' Riempio lista attrezzaggi salvati
       m_ArchivedSetUpList.Add(String.Empty)
       If Directory.Exists(IniFile.m_sCurrMachSetUpDirPath) Then

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,10 +290,11 @@ 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()
+         If Not IsNothing(Map.refMachiningTreeExpanderVM) Then Map.refMachiningTreeExpanderVM.UpdateOperationMachiningList()
       End If
    End Sub
 

MainWindow/MainWindowV.xaml

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

MainWindow/MainWindowVM.vb

@@ -16,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
 
@@ -357,9 +358,6 @@ Public Class MainWindowVM
       ' Impostazione direttorio toolmakers
       Dim sToolMakersDir As String = String.Empty
       GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR, "", sToolMakersDir)
-#If PLATFORM = "x64" Then
-         GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR64, sToolMakersDir, sToolMakersDir)
-#End If
       If Not String.IsNullOrWhiteSpace(sToolMakersDir) Then
          IniFile.m_sToolMakersDir = sToolMakersDir
       Else
@@ -388,8 +386,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2511, 1, IniFile.m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2611, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2511, 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
@@ -436,9 +434,6 @@ Public Class MainWindowVM
       ' Imposto dir di default per libreria Lua e lancio libreria di base
       Dim sLuaLibsDir As String = String.Empty
       GetPrivateProfileString(S_LUA, K_LIBSDIR, "", sLuaLibsDir)
-#If PLATFORM = "x64" Then
-         GetPrivateProfileString(S_LUA, K_LIBSDIR64, sLuaLibsDir, sLuaLibsDir)
-#End If
       EgtSetLuaLibs(sLuaLibsDir)
       Dim sLuaBaseLib As String = String.Empty
       GetPrivateProfileString(S_LUA, K_BASELIB, "EgtBase", sLuaBaseLib)
@@ -603,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

@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("EgtCAM5")>
-<Assembly: AssemblyCopyright("Copyright ©  2016-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2016-2024 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.11.2")>
+<Assembly: AssemblyVersion("2.6.11.1")>
-<Assembly: AssemblyFileVersion("2.5.11.2")>
+<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/LayerTreeView.vb

@@ -93,7 +93,7 @@ Public Class LayerTreeViewItem
                      EgtGetStatus(Node.Id, nStat)
                      If value AndAlso nStat <> GDB_ST.ON_ Then
                         EgtSetStatus(Node.Id, GDB_ST.ON_)
-                     ElseIf nStat <> GDB_ST.OFF Then
+                     ElseIf Not value AndAlso nStat <> GDB_ST.OFF Then
                         EgtSetStatus(Node.Id, GDB_ST.OFF)
                      End If
                   End If

OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml

@@ -21,7 +21,7 @@
             <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}"
                    VirtualizingStackPanel.IsVirtualizing = "True"
                    VirtualizingStackPanel.VirtualizationMode = "Recycling">

OptionPanel/DrawOptionPanelV.xaml

@@ -1,16 +1,30 @@
 <UserControl x:Class="DrawOptionPanelV"
              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,25 +120,33 @@ 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
+            EgtMoveFixture( nAddedFixtureId, 0.2 * vtTabDim.y * Vector3d.Y_AX())
+            If Not PositionFixtureOnNearestHook(nAddedFixtureId) Then
+               EgtMoveFixture( nAddedFixtureId, 0.2 * vtTabDim.y * Vector3d.Y_AX())
                If Not PositionFixtureOnNearestHook(nAddedFixtureId) Then
                   ' non ci sono punti liberi, quindi rimuovo la ventosa e segnalo
                   EgtRemoveFixture(nAddedFixtureId)
                   MessageBox.Show("No free hook point!", "ERROR")
                   Return
                End If
+            End If
+         End If
+      ' altrimenti ventosa con movimento continuo
       Else
-         ' se non ha punti di ancoraggio
          ' verifico se è in una posizione valida
          If Not DispositionUtility.VerifyFixturePosition(nAddedFixtureId, New Vector3d) Then
             ' se non trovo una posizione valida, esco
@@ -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,14 +292,21 @@ 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)
+      While nTableFixedId <> GDB_ID.NULL
          nCurrHookId = EgtGetFirstNameInGroup(nTableFixedId, DispositionUtility.HOOK)
          While nCurrHookId <> GDB_ID.NULL
             ' se punto di aggancio valido
@@ -309,17 +315,52 @@ 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 barre mobili
+         nTableFixedId = EgtGetNextName( nTableFixedId, DispositionUtility.FIXED)
-      Dim nMobileInd As Integer = 1
+      End While
-      Dim nMobile As Integer = EgtGetFirstNameInGroup(nTableId, DispositionUtility.MOBILE & nMobileInd)
+      ' *** Cerco hook su barre mobili ***
-      While nMobile <> GDB_ID.NULL
+      Dim nBarId As Integer = EgtGetFirstGroupInGroup(nTableId)
-         nCurrHookId = EgtGetFirstNameInGroup(nMobile, DispositionUtility.HOOK)
+      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
@@ -327,47 +368,59 @@ 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
+               End If
-         nMobile = EgtGetFirstNameInGroup(nTableId, DispositionUtility.MOBILE & nMobileInd)
+               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
+
+      ' Verifico se della stessa classe
+      Dim nTableHookClass As Integer = DispositionUtility.GetHookClass( nCurrHookId)
+      If nTableHookClass <> nFixtHookClass Then
+         Return False
+      End If
+
       Dim dDist As Double = 0
       ' punto a distanza minima sull'hook
       If nTableHookType = GDB_TY.GEO_POINT Then
          ' verifico se utilizzato
-               Dim nTableHookUsed As Boolean = False
+         If Not DispositionUtility.GetIsHookUsed( nCurrHookId) Then
-               If Not EgtGetInfo(nCurrHookId, DispositionUtility.USED, nTableHookUsed) Then
             ' calcolo distanza punto hook tavola dal punto hook della ventosa
             EgtStartPoint(nCurrHookId, GDB_ID.ROOT, ptCurrHook)
             Return True
          End If
       ElseIf nTableHookType = GDB_TY.CRV_LINE Then
          ' calcolo distanza linea hook tavola dal punto hook della ventosa
-               Dim nRefId As Integer = 0
+         Dim ptL1 As Point3d : EgtStartPoint( nCurrHookId, GDB_ID.ROOT, ptL1)
-               Dim dU As Double = 0
+         Dim ptL2 As Point3d : EgtEndPoint( nCurrHookId, GDB_ID.ROOT, ptL2)
-               EgtPointCurveDist(ptFixtHook, nCurrHookId, nRefId, dDist, dU)
+         ptCurrHook = DispositionUtility.DistPointSegment( ptFixtHook, ptL1, ptL2)
-               EgtAtParamPoint(nCurrHookId, dU, GDB_ID.ROOT, ptCurrHook)
          Return True
       End If
-         End If
-      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

@@ -81,14 +81,40 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                  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>
+         <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}"
@@ -116,39 +142,33 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OverLapTxBl}" 
-                               ParamTxBl="{Binding OverLapTxBl}" 
                                         ParamTxBx="{Binding Path=OverLap,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                  ParamTxBl="{Binding StepTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=StepTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
                                         ParamTxBx="{Binding Path=OffSr,
                                          UpdateSourceTrigger=PropertyChanged,
                                          ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
                                         ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -156,36 +176,52 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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:CheckParamV 
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
                                           ParamChBx="{Binding Path=InvertToolDir,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding FaceUseTypeTxBl}" 
-                                  ParamTxBl="{Binding FaceUseTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=FaceUseTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True}"
                                           ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
                                           Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -193,12 +229,74 @@
                                           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}"/>
+                                 </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 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadInTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -206,32 +304,64 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=StartAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                                     ParamTxBl="{Binding LiTangTxBl}" 
                                         ParamTxBx="{Binding Path=LiTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                                     ParamTxBl="{Binding LiPerpTxBl}" 
                                         ParamTxBx="{Binding Path=LiPerp,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}" 
-                                     ParamTxBl="{Binding LiElevTxBl}" 
                                         ParamTxBx="{Binding Path=LiElev,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiCompLenTxBl}" 
-                                     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}" 
+                                       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}" 
@@ -241,8 +371,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -250,32 +379,64 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                                     ParamTxBl="{Binding LoTangTxBl}" 
                                         ParamTxBx="{Binding Path=LoTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                                     ParamTxBl="{Binding LoPerpTxBl}" 
                                         ParamTxBx="{Binding Path=LoPerp,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoElevTxBl}" 
-                                     ParamTxBl="{Binding LoElevTxBl}" 
                                         ParamTxBx="{Binding Path=LoElev,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoCompLenTxBl}" 
-                                     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}" 
+                                       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}" 
@@ -285,51 +446,91 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding LeaveTabTxBl}" 
-                                     ParamTxBl="{Binding LeaveTabTxBl}" 
                                        ParamChBx="{Binding Path=LeaveTab,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource CheckParamV_Margin}"/>
             </Expander.Header>
             <StackPanel Margin="2">
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabLenTxBl}" 
-                                     ParamTxBl="{Binding TabLenTxBl}" 
                                         ParamTxBx="{Binding Path=TabLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         ParamErrorMsg="{Binding Path=TabLenErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabHeightTxBl}" 
-                                     ParamTxBl="{Binding TabHeightTxBl}" 
                                         ParamTxBx="{Binding Path=TabHeight,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         ParamErrorMsg="{Binding Path=TabHeightErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabAngleTxBl}" 
-                                     ParamTxBl="{Binding TabAngleTxBl}" 
                                         ParamTxBx="{Binding Path=TabAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         ParamErrorMsg="{Binding Path=TabAngleErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabDistTxBl}" 
-                                     ParamTxBl="{Binding TabDistTxBl}" 
                                         ParamTxBx="{Binding Path=TabDist,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}"
                                         ParamErrorMsg="{Binding Path=TabDistErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMinTxBl}" 
-                                     ParamTxBl="{Binding TabMinTxBl}" 
                                         ParamTxBx="{Binding Path=TabMin,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}"
                                         ParamErrorMsg="{Binding Path=TabMinErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMaxTxBl}" 
-                                     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}" 
+                                       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}"
@@ -343,38 +544,34 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          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>

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class BeamMillingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class BeamMillingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class BeamMillingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class BeamMillingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml

@@ -81,14 +81,12 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
@@ -116,32 +114,27 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ReturnPosTxBl}" 
-                               ParamTxBl="{Binding ReturnPosTxBl}" 
                                         ParamTxBx="{Binding Path=ReturnPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
                                         ParamTxBx="{Binding Path=OffSr,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
                                         ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -149,29 +142,46 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
                                           ParamChBx="{Binding Path=InvertToolDir,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -179,13 +189,75 @@
                                           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}"/>
+                                 </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 Header="{Binding LeadOutTypeMsg}" Name="LeadOutType"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -198,32 +270,27 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                          UpdateSourceTrigger=PropertyChanged,
                                          ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class ChiselingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class ChiselingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class ChiselingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class ChiselingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

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/GenMachiningParameterExpanderV.xaml

@@ -81,8 +81,7 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
@@ -109,27 +108,23 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
-                               ParamTxBl="{Binding SubTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=SubTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
                                         ParamTxBx="{Binding Path=OffSr,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
                                         ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -137,29 +132,46 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                               ParamTxBl="{Binding InvertToolDirTxBl}" 
                                           ParamChBx="{Binding Path=InvertToolDir,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -167,6 +179,69 @@
                                           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}"/>
+                                 </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}">
@@ -174,33 +249,28 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         ParamErrorMsg="{Binding Path=SpeedErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class GenMachiningParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class GenMachiningParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class GenMachiningParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class GenMachiningParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml

@@ -81,17 +81,29 @@
       <Button Name="ApplyMachBtn" Height="30" Content="{Binding UpdateMachiningBtnMsg}"
               Command="{Binding UpdateMachiningCommand}" Background="{Binding UpdateMachiningBtn_Background}"/>
       <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
          <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-            <ToggleButton Name="ViewToolBtn" Grid.Column="0" Height="30" Content="{Binding ViewToolBtnMsg}"
+
-                IsChecked="{Binding ViewTool}" />
+         <CheckBox Name="ViewToolBtn"
-            <Button Name="NextStepToolBtn" Grid.Column="1" Height="30" Content="{Binding NextStepToolBtnMsg}"
+                   Content="{Binding ViewToolBtnMsg}"
-                Command="{Binding NextStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
+                   IsChecked="{Binding ViewTool}"
-            <Button Name="PrevStepToolBtn" Grid.Column="2" Height="30" Content="{Binding PrevStepToolBtnMsg}"
+                   Style="{StaticResource ViewTool_CheckBox}"/>
-                Command="{Binding PrevStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
+
+         <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>
 

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)
 
@@ -136,35 +193,44 @@ Public Class MachiningParameterExpanderVM
          Select Case nType
             Case MCH_OY.DRILLING
                If MatType = MaterialType.STONE Then
+                  If IsNothing(StoneDrillParamExpanderV) Then StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
                   StoneDrillParamExpanderV.DataContext = m_CurrOperation
                   Return StoneDrillParamExpanderV
                Else
+                  If IsNothing(WoodDrillParamExpanderV) Then WoodDrillParamExpanderV = New WoodDrillingParameterExpanderV
                   WoodDrillParamExpanderV.DataContext = m_CurrOperation
                   Return WoodDrillParamExpanderV
                End If
             Case MCH_OY.SAWING
                If MatType = MaterialType.STONE Then
+                  If IsNothing(StoneSawParamExpanderV) Then StoneSawParamExpanderV = New StoneSawingParameterExpanderV
                   StoneSawParamExpanderV.DataContext = m_CurrOperation
                   Return StoneSawParamExpanderV
                Else
+                  If IsNothing(WoodSawParamExpanderV) Then WoodSawParamExpanderV = New WoodSawingParameterExpanderV
                   WoodSawParamExpanderV.DataContext = m_CurrOperation
                   Return WoodSawParamExpanderV
                End If
             Case MCH_OY.MILLING
                If MatType = MaterialType.BEAM Then
+                  If IsNothing(BeamMillParamExpanderV) Then BeamMillParamExpanderV = New BeamMillingParameterExpanderV
                   BeamMillParamExpanderV.DataContext = m_CurrOperation
                   Return BeamMillParamExpanderV
                ElseIf MatType = MaterialType.STONE Then
+                  If IsNothing(StoneMillParamExpanderV) Then StoneMillParamExpanderV = New StoneMillingParameterExpanderV
                   StoneMillParamExpanderV.DataContext = m_CurrOperation
                   Return StoneMillParamExpanderV
                Else
+                  If IsNothing(WoodMillParamExpanderV) Then WoodMillParamExpanderV = New WoodMillingParameterExpanderV
                   WoodMillParamExpanderV.DataContext = m_CurrOperation
                   Return WoodMillParamExpanderV
                End If
             Case MCH_OY.SAWROUGHING
+               If IsNothing(StoneSawRoughParamExpanderV) Then StoneSawRoughParamExpanderV = New StoneSawRoughingParameterExpanderV
                StoneSawRoughParamExpanderV.DataContext = m_CurrOperation
                Return StoneSawRoughParamExpanderV
             Case MCH_OY.SAWFINISHING
+               If IsNothing(StoneSawFinishParamExpanderV) Then StoneSawFinishParamExpanderV = New StoneSawFinishingParameterExpanderV
                StoneSawFinishParamExpanderV.DataContext = m_CurrOperation
                Return StoneSawFinishParamExpanderV
             Case MCH_OY.POCKETING
@@ -180,23 +246,37 @@ Public Class MachiningParameterExpanderVM
                   ' se utensile di tipo POLISHING rendo visibili i campi sugli epicicli
                   If nToolType = MCH_TY.MILL_POLISHING Then m_CurrOperation.Epicycles_Visibility = Visibility.Visible
                End If
+               If IsNothing(PocketParamExpanderV) Then PocketParamExpanderV = New PocketingParameterExpanderV
                PocketParamExpanderV.DataContext = m_CurrOperation
                Return PocketParamExpanderV
             Case MCH_OY.MORTISING
+               If IsNothing(MortiseParamExpanderV) Then MortiseParamExpanderV = New MortisingParameterExpanderV
                MortiseParamExpanderV.DataContext = m_CurrOperation
                Return MortiseParamExpanderV
             Case MCH_OY.GENMACHINING
+               If IsNothing(GenMachinParamExpanderV) Then GenMachinParamExpanderV = New GenMachiningParameterExpanderV
                GenMachinParamExpanderV.DataContext = m_CurrOperation
                Return GenMachinParamExpanderV
             Case MCH_OY.CHISELING
+               If IsNothing(ChiselParamExpanderV) Then ChiselParamExpanderV = New ChiselingParameterExpanderV
                ChiselParamExpanderV.DataContext = m_CurrOperation
                Return ChiselParamExpanderV
             Case MCH_OY.SURFFINISHING
+               If IsNothing(SurfFinishParamExpanderV) Then SurfFinishParamExpanderV = New SurfFinishingParameterExpanderV
                SurfFinishParamExpanderV.DataContext = m_CurrOperation
                Return SurfFinishParamExpanderV
             Case MCH_OY.WATERJETTING
+               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()
@@ -242,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>
@@ -349,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
@@ -428,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()
@@ -488,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/MortisingParameterExpanderV.xaml

@@ -76,19 +76,18 @@
    <StackPanel Name="OperationParametersStackPanel">
       <StackPanel Name="OperationFirstParametersStackPanel">
          <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <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 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
@@ -116,33 +115,28 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                  ParamTxBl="{Binding StepTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=StepTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
                                         ParamTxBx="{Binding Path=OffSr,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
                                         ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -150,36 +144,52 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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:CheckParamV 
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
                                           ParamChBx="{Binding Path=InvertToolDir,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding FaceUseTypeTxBl}" 
-                                  ParamTxBl="{Binding FaceUseTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=FaceUseTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True}"
                                           ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
                                           Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -187,13 +197,75 @@
                                           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}"/>
+                                 </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 Header="{Binding LeadInTypeMsg}" Name="LeadInTypeMsg"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=StartAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -204,8 +276,7 @@
          <Expander Header="{Binding LeadOutTypeMsg}" Name="LeadOutType"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -218,32 +289,27 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class MortisingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class MortisingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class MortisingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class MortisingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml

@@ -81,8 +81,7 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
@@ -109,59 +108,50 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
-                                  ParamTxBl="{Binding SubTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=SubTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedSubType}"
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideStepTxBl}" 
-                               ParamTxBl="{Binding SideStepTxBl}" 
                                         ParamTxBx="{Binding Path=SideStep,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
                                         ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                                 ParamTxBl="{Binding OffsetSrTxBl}" 
                                         ParamTxBx="{Binding Path=OffSr,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EpicyclesRadTxBl}" 
-                               ParamTxBl="{Binding EpicyclesRadTxBl}" 
                                         ParamTxBx="{Binding Path=EpicyclesRad,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"
                                         Visibility="{Binding Epicycles_Visibility}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EpicyclesDistTxBl}" 
-                               ParamTxBl="{Binding EpicyclesDistTxBl}" 
                                         ParamTxBx="{Binding Path=EpicyclesDist,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"
                                         Visibility="{Binding Epicycles_Visibility}"/>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                                 ParamTxBl="{Binding SideAngleTxBl}" 
                                         ParamTxBx="{Binding Path=SideAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -169,29 +159,46 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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:CheckParamV 
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
                                           ParamChBx="{Binding Path=InvertToolDir,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -199,12 +206,74 @@
                                           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}"/>
+                                 </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 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadInTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -212,14 +281,12 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                                     ParamTxBl="{Binding LiTangTxBl}" 
                                         ParamTxBx="{Binding Path=LiTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}" 
-                                     ParamTxBl="{Binding LiElevTxBl}" 
                                         ParamTxBx="{Binding Path=LiElev,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -229,8 +296,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -238,8 +304,7 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                                     ParamTxBl="{Binding LoTangTxBl}" 
                                         ParamTxBx="{Binding Path=LoTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -252,38 +317,34 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          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>

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class PocketingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class PocketingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class PocketingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class PocketingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml

@@ -103,38 +103,32 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                          UpdateSourceTrigger=PropertyChanged,
                                          ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ReturnPosTxBl}" 
-                               ParamTxBl="{Binding ReturnPosTxBl}" 
                                         ParamTxBx="{Binding Path=ReturnPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ThrouAddLenTxBl}" 
-                                     ParamTxBl="{Binding ThrouAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=ThrouAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                     ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartSlowLenTxBl}" 
-                                     ParamTxBl="{Binding StartSlowLenTxBl}" 
                                         ParamTxBx="{Binding Path=StartSlowLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndSlowLenTxBl}" 
-                                     ParamTxBl="{Binding EndSlowLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndSlowLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -142,23 +136,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -166,6 +178,69 @@
                                           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}"/>
+                                 </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}">
@@ -173,32 +248,27 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneDrillingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class StoneDrillingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneDrillingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class StoneDrillingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml

@@ -81,14 +81,12 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
@@ -116,28 +114,24 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadInTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -146,23 +140,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -170,6 +182,69 @@
                                           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}"/>
+                                 </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}">
@@ -177,32 +252,27 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneMillingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class StoneMillingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneMillingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class StoneMillingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml

@@ -81,14 +81,12 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
-                                     ParamTxBl="{Binding SubTypeTxBl}" 
                                  ParamCmBxList="{Binding Path=SubTypeList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
@@ -126,8 +124,7 @@
                                                             ValidatesOnDataErrors=True}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
 
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadLinkTypeTxBl}" 
-                                     ParamTxBl="{Binding LeadLinkTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadLinkTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -137,23 +134,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -161,28 +176,88 @@
                                           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}"/>
+                                 </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 Header="{Binding StepGpBxLbl}" 
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                     ParamTxBl="{Binding StepTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=StepTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
 
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                     ParamTxBl="{Binding StepParTxBl}" 
                                        ParamTxBx="{Binding Path=StepPar,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
 
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideStepTxBl}" 
-                                 ParamTxBl="{Binding SideStepTxBl}" 
                                         ParamTxBx="{Binding Path=SideStep,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -213,38 +288,32 @@
             </Expander.Header>
             <StackPanel>
 
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                               ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                               ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                               ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                               ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding VertFeedTxBl}" 
-                               ParamTxBl="{Binding VertFeedTxBl}" 
                                         ParamTxBx="{Binding Path=VertFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneSawFinishingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class StoneSawFinishingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneSawFinishingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class StoneSawFinishingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml

@@ -82,15 +82,13 @@
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
 
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                     ParamTxBl="{Binding StepTypeTxBl}" 
                                  ParamCmBxList="{Binding Path=StepTypeList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
 
-
          <UniformGrid Columns="2">
             <TextBlock Text="{Binding UserNotesTxBl}" 
                        Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
@@ -113,8 +111,7 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding HeadSideTxBl}" 
-                                  ParamTxBl="{Binding HeadSideTxBl}" 
                                        ParamCmBxList="{Binding Path=HeadSideList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -126,9 +123,7 @@
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtLinkTypeTxBl}" 
-                    <EgtWPFLib5:ComboParamV 
-                                     ParamTxBl="{Binding ExtLinkTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=ExtLinkTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -137,23 +132,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -161,19 +174,80 @@
                                           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}"/>
+                                 </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 Header="{Binding StepGpBxLbl}" 
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                     ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideStepTxBl}" 
-                                 ParamTxBl="{Binding SideStepTxBl}" 
                                         ParamTxBx="{Binding Path=SideStep,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -209,32 +283,27 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                               ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                               ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                               ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                               ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneSawRoughingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class StoneSawRoughingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneSawRoughingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class StoneSawRoughingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml

@@ -81,8 +81,7 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
@@ -110,35 +109,30 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                        ParamCmBxList="{Binding Path=WorkSideList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding HeadSideTxBl}" 
-                                  ParamTxBl="{Binding HeadSideTxBl}" 
                                        ParamCmBxList="{Binding Path=HeadSideList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedHeadSide}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                                  ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtLinkTypeTxBl}" 
-                                  ParamTxBl="{Binding ExtLinkTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=ExtLinkTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}"
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                               ParamTxBl="{Binding SideAngleTxBl}" 
                                         ParamTxBx="{Binding Path=SideAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -146,23 +140,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -170,12 +182,74 @@
                                           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}"/>
+                                 </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 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadInTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -183,20 +257,17 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=StartAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangStoneTxBl}" 
-                               ParamTxBl="{Binding LiTangStoneTxBl}" 
                                         ParamTxBx="{Binding Path=LiTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}"  
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevStoneTxBl}" 
-                               ParamTxBl="{Binding LiElevStoneTxBl}" 
                                         ParamTxBx="{Binding Path=LiElev,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}"  
@@ -206,8 +277,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -215,8 +285,7 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -229,51 +298,43 @@
                <TextBlock Text="{Binding StepGpBxLbl}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                               ParamTxBl="{Binding StepTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=StepTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepBackTxBl}" 
-                               ParamTxBl="{Binding StepBackTxBl}" 
                                         ParamTxBx="{Binding Path=StepBack,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepSideAngTxBl}" 
-                               ParamTxBl="{Binding StepSideAngTxBl}" 
                                         ParamTxBx="{Binding Path=StepSideAng,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepSideAngBackTxBl}" 
-                               ParamTxBl="{Binding StepSideAngBackTxBl}" 
                                         ParamTxBx="{Binding Path=StepSideAngBack,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepIntArcTxBl}" 
-                               ParamTxBl="{Binding StepIntArcTxBl}" 
                                         ParamTxBx="{Binding Path=StepIntArc,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepExtArcTxBl}" 
-                               ParamTxBl="{Binding StepExtArcTxBl}" 
                                         ParamTxBx="{Binding Path=StepExtArc,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepLastTxBl}" 
-                               ParamTxBl="{Binding StepLastTxBl}" 
                                         ParamTxBx="{Binding Path=StepLast,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -284,8 +345,7 @@
          <Expander Header="{Binding OffsetGpBxLbl}"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
                                         ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -299,44 +359,37 @@
             </Expander.Header>
             <StackPanel>
 
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                               ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                               ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                               ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                               ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding BackFeedTxBl}" 
-                               ParamTxBl="{Binding BackFeedTxBl}" 
                                         ParamTxBx="{Binding Path=BackFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngFeedTxBl}" 
-                               ParamTxBl="{Binding SideAngFeedTxBl}" 
                                         ParamTxBx="{Binding Path=SideAngFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class StoneSawingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class StoneSawingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneSawingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class StoneSawingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml

@@ -81,21 +81,18 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
-                                     ParamTxBl="{Binding SubTypeTxBl}" 
                                  ParamCmBxList="{Binding Path=SubTypeList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
-            <EgtWPFLib5:StringParamV 
+         <EgtWPFLib5:StringParamV ParamTxBl="{Binding OverLapTxBl}" 
-                                     ParamTxBl="{Binding OverLapTxBl}" 
                                   ParamTxBx="{Binding Path=OverLap,
                                                       UpdateSourceTrigger=PropertyChanged,
                                                       ValidatesOnDataErrors=True}" 
@@ -122,39 +119,33 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadLinkTypeTxBl}" 
-                                     ParamTxBl="{Binding LeadLinkTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadLinkTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                                     ParamTxBl="{Binding SideAngleTxBl}" 
                                         ParamTxBx="{Binding Path=SideAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideStepTxBl}" 
-                               ParamTxBl="{Binding SideStepTxBl}" 
                                         ParamTxBx="{Binding Path=SideStep,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
                                         ParamTxBx="{Binding Path=OffSr,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ApproxTxBl}" 
-                                     ParamTxBl="{Binding ApproxTxBl}" 
                                         ParamTxBx="{Binding Path=Approx,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -162,23 +153,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -186,12 +195,74 @@
                                           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}"/>
+                                 </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 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadInTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -199,14 +270,12 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                                     ParamTxBl="{Binding LiTangTxBl}" 
                                         ParamTxBx="{Binding Path=LiTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                                     ParamTxBl="{Binding LiPerpTxBl}" 
                                         ParamTxBx="{Binding Path=LiPerp,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -216,8 +285,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -225,14 +293,12 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                                     ParamTxBl="{Binding LoTangTxBl}" 
                                         ParamTxBx="{Binding Path=LoTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                                     ParamTxBl="{Binding LoPerpTxBl}" 
                                         ParamTxBx="{Binding Path=LoPerp,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -245,32 +311,27 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class SurfFinishingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class SurfFinishingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class SurfFinishingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class SurfFinishingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

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/MachiningParameterExpander/WaterjettingParameterExpanderV.xaml

@@ -76,21 +76,18 @@
    <StackPanel Name="OperationParametersStackPanel">
       <StackPanel Name="OperationFirstParametersStackPanel">
 
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
-            <EgtWPFLib5:StringParamV 
+         <EgtWPFLib5:StringParamV ParamTxBl="{Binding ForwardAngleTxBl}" 
-                                  ParamTxBl="{Binding ForwardAngleTxBl}" 
                                   ParamTxBx="{Binding Path=ForwardAngle,
                                                       UpdateSourceTrigger=PropertyChanged,
                                                       ValidatesOnDataErrors=True}" 
@@ -117,8 +114,7 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                               ParamTxBl="{Binding SideAngleTxBl}" 
                                         ParamTxBx="{Binding Path=SideAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -126,23 +122,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -150,12 +164,74 @@
                                           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}"/>
+                                 </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 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadInTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -163,22 +239,19 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=StartAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
 
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                                     ParamTxBl="{Binding LiTangTxBl}" 
                                         ParamTxBx="{Binding Path=LiTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
 
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                                     ParamTxBl="{Binding LiPerpTxBl}" 
                                         ParamTxBx="{Binding Path=LiPerp,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -216,8 +289,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -225,20 +297,17 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                                     ParamTxBl="{Binding LoTangTxBl}" 
                                         ParamTxBx="{Binding Path=LoTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                                     ParamTxBl="{Binding LoPerpTxBl}" 
                                         ParamTxBx="{Binding Path=LoPerp,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -250,31 +319,27 @@
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
 
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtCornTypeTxBl}" 
-                                     ParamTxBl="{Binding ExtCornTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=ExtCornTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedExtCornType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
 
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding IntCornTypeTxBl}" 
-                                 ParamTxBl="{Binding IntCornTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=IntCornTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedIntCornType}" 
                                        Style="{DynamicResource ComboParamV_Margin}"/>
 
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding CornSlowLenTxBl}" 
-                                 ParamTxBl="{Binding CornSlowLenTxBl}" 
                                         ParamTxBx="{Binding Path=CornSlowLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
 
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding CornSlowPercTxBl}" 
-                                 ParamTxBl="{Binding CornSlowPercTxBl}" 
                                         ParamTxBx="{Binding Path=CornSlowPerc,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -284,8 +349,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding ProbingGpBxLbl}" 
-                                     ParamTxBl="{Binding ProbingGpBxLbl}" 
                                        ParamChBx="{Binding Path=Probing,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}"
@@ -310,8 +374,7 @@
          <Expander Header="{Binding OffsetGpBxLbl}"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
                                         ParamTxBx="{Binding Path=OffSr,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -324,20 +387,17 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ThicknessFeedTxBl}" 
-                          ParamTxBl="{Binding ThicknessFeedTxBl}" 
                                         ParamTxBx="{Binding Path=ThicknessFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class WaterjettingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class WaterjettingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class WaterjettingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class WaterjettingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodDrillingParameterExpanderV.xaml

@@ -81,8 +81,7 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
@@ -109,38 +108,32 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ReturnPosTxBl}" 
-                               ParamTxBl="{Binding ReturnPosTxBl}" 
                                         ParamTxBx="{Binding Path=ReturnPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ThrouAddLenTxBl}" 
-                                     ParamTxBl="{Binding ThrouAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=ThrouAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                     ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartSlowLenTxBl}" 
-                                     ParamTxBl="{Binding StartSlowLenTxBl}" 
                                         ParamTxBx="{Binding Path=StartSlowLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndSlowLenTxBl}" 
-                                     ParamTxBl="{Binding EndSlowLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndSlowLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -148,23 +141,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -172,6 +183,69 @@
                                           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}"/>
+                                 </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}">
@@ -179,32 +253,27 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class WoodDrillingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class WoodDrillingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class WoodDrillingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class WoodDrillingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodMillingParameterExpanderV.xaml

@@ -81,14 +81,12 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
@@ -116,39 +114,33 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OverLapTxBl}" 
-                               ParamTxBl="{Binding OverLapTxBl}" 
                                         ParamTxBx="{Binding Path=OverLap,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                  ParamTxBl="{Binding StepTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=StepTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
                                         ParamTxBx="{Binding Path=OffSr,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
                                         ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -156,36 +148,52 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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:CheckParamV 
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
                                           ParamChBx="{Binding Path=InvertToolDir,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding FaceUseTypeTxBl}" 
-                                  ParamTxBl="{Binding FaceUseTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=FaceUseTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True}"
                                           ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
                                           Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -193,12 +201,74 @@
                                           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}"/>
+                                 </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 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadInTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -206,32 +276,27 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=StartAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                                     ParamTxBl="{Binding LiTangTxBl}" 
                                         ParamTxBx="{Binding Path=LiTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                                     ParamTxBl="{Binding LiPerpTxBl}" 
                                         ParamTxBx="{Binding Path=LiPerp,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}" 
-                                     ParamTxBl="{Binding LiElevTxBl}" 
                                         ParamTxBx="{Binding Path=LiElev,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiCompLenTxBl}" 
-                                     ParamTxBl="{Binding LiCompLenTxBl}" 
                                         ParamTxBx="{Binding Path=LiCompLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -241,8 +306,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -250,32 +314,27 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                                     ParamTxBl="{Binding LoTangTxBl}" 
                                         ParamTxBx="{Binding Path=LoTang,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                                     ParamTxBl="{Binding LoPerpTxBl}" 
                                         ParamTxBx="{Binding Path=LoPerp,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoElevTxBl}" 
-                                     ParamTxBl="{Binding LoElevTxBl}" 
                                         ParamTxBx="{Binding Path=LoElev,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoCompLenTxBl}" 
-                                     ParamTxBl="{Binding LoCompLenTxBl}" 
                                         ParamTxBx="{Binding Path=LoCompLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -285,51 +344,44 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding LeaveTabTxBl}" 
-                                     ParamTxBl="{Binding LeaveTabTxBl}" 
                                        ParamChBx="{Binding Path=LeaveTab,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource CheckParamV_Margin}"/>
             </Expander.Header>
             <StackPanel Margin="2">
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabLenTxBl}" 
-                                     ParamTxBl="{Binding TabLenTxBl}" 
                                         ParamTxBx="{Binding Path=TabLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         ParamErrorMsg="{Binding Path=TabLenErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                            <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabHeightTxBl}" 
-                                     ParamTxBl="{Binding TabHeightTxBl}" 
                                         ParamTxBx="{Binding Path=TabHeight,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         ParamErrorMsg="{Binding Path=TabHeightErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabAngleTxBl}" 
-                                     ParamTxBl="{Binding TabAngleTxBl}" 
                                         ParamTxBx="{Binding Path=TabAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         ParamErrorMsg="{Binding Path=TabAngleErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabDistTxBl}" 
-                                     ParamTxBl="{Binding TabDistTxBl}" 
                                         ParamTxBx="{Binding Path=TabDist,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}"
                                         ParamErrorMsg="{Binding Path=TabDistErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMinTxBl}" 
-                                     ParamTxBl="{Binding TabMinTxBl}" 
                                         ParamTxBx="{Binding Path=TabMin,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}"
                                         ParamErrorMsg="{Binding Path=TabMinErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMaxTxBl}" 
-                                     ParamTxBl="{Binding TabMaxTxBl}" 
                                         ParamTxBx="{Binding Path=TabMax,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}"
@@ -340,28 +392,24 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding OscEnableTxBl}" 
-                                     ParamTxBl="{Binding OscEnableTxBl}" 
                                        ParamChBx="{Binding Path=OscEnable,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource CheckParamV_Margin}"/>
             </Expander.Header>
             <StackPanel Margin="2">
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OscHeightTxBl}" 
-                                     ParamTxBl="{Binding OscHeightTxBl}" 
                                         ParamTxBx="{Binding Path=OscHeight,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OscRampLenTxBl}" 
-                                     ParamTxBl="{Binding OscRampLenTxBl}" 
                                         ParamTxBx="{Binding Path=OscRampLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OscFlatLenTxBl}" 
-                                     ParamTxBl="{Binding OscFlatLenTxBl}" 
                                         ParamTxBx="{Binding Path=OscFlatLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -374,33 +422,28 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         ParamErrorMsg="{Binding Path=SpeedErrorMsg}"
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class WoodMillingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class WoodMillingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class WoodMillingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class WoodMillingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodSawingParameterExpanderV.xaml

@@ -81,21 +81,18 @@
                                                   Converter={StaticResource DepthUnitConverter}}"
                                    Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
          </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
                                  ParamChBx="{Binding Path=Invert,
                                                      UpdateSourceTrigger=PropertyChanged,
                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource CheckParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding HeadSideTxBl}" 
-                                  ParamTxBl="{Binding HeadSideTxBl}" 
                                  ParamCmBxList="{Binding Path=HeadSideList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True}"
@@ -123,33 +120,28 @@
          <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
                                         ParamTxBx="{Binding Path=StartPos,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                  ParamTxBl="{Binding StepTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=StepTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
                                        ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
                                        Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
                                         ParamTxBx="{Binding Path=StepPar,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                               ParamTxBl="{Binding SideAngleTxBl}" 
                                         ParamTxBx="{Binding Path=SideAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
                                         ParamTxBx="{Binding Path=OffSl,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -157,23 +149,41 @@
             </StackPanel>
          </Expander>
 
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <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 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
                                            ParamTxBx="{Binding Path=InitAngs,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
                                            ParamTxBx="{Binding Path=BlockedAxis,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" 
                                            Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                           ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                   UpdateSourceTrigger=PropertyChanged,
                                                                   ValidatesOnDataErrors=True,
@@ -181,12 +191,74 @@
                                           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}"/>
+                                 </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 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadInTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -194,8 +266,7 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=StartAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -205,8 +276,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                        ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}"
@@ -214,8 +284,7 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
                                         ParamTxBx="{Binding Path=EndAddLen,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -223,8 +292,7 @@
             </StackPanel>
          </Expander>
 
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtLinkTypeTxBl}" 
-                                  ParamTxBl="{Binding ExtLinkTypeTxBl}" 
                                  ParamCmBxList="{Binding Path=ExtLinkTypeList,
                                                          UpdateSourceTrigger=PropertyChanged,
                                                          ValidatesOnDataErrors=True, 
@@ -234,8 +302,7 @@
 
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding CurveUseTxBl}" 
-                                  ParamTxBl="{Binding CurveUseTxBl}" 
                                        ParamCmBxList="{Binding Path=CurveUseList,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True, 
@@ -244,8 +311,7 @@
                                        Style="{DynamicResource ComboParamV_Margin}"/>
             </Expander.Header>
             <StackPanel Margin="2">
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ApproxTxBl}" 
-                               ParamTxBl="{Binding ApproxTxBl}" 
                                         ParamTxBx="{Binding Path=Approx,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
@@ -258,32 +324,27 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
                                         ParamTxBx="{Binding Path=Speed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
                                         ParamTxBx="{Binding Path=Feed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          ParamTxBl="{Binding TipFeedTxBl}" 
                                         ParamTxBx="{Binding Path=TipFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
                                         ParamTxBx="{Binding Path=StartFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                          ParamTxBl="{Binding EndFeedTxBl}" 
                                         ParamTxBx="{Binding Path=EndFeed,
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 

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

@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 
 Public Class WoodSawingParameterExpanderV
 
-   Private EgtFloatingTray As EgtFloatingTray
+   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
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
          EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
          Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
          m_bFirst = False
       End If
@@ -22,7 +22,7 @@ Public Class WoodSawingParameterExpanderV
 
    Dim m_bSizeChanging As Boolean = False
 
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       If m_bSizeChanging Then Return
       m_bSizeChanging = True
       CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class WoodSawingParameterExpanderV
    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)
@@ -53,7 +54,7 @@ Public Class WoodSawingParameterExpanderV
             OpenedExpanderList.Add(False)
          End If
       Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      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

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

@@ -126,6 +126,12 @@ Public Class OperationListBoxItem
             ' 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,16 +270,22 @@ 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
       Dim nShowDataCounter As Integer = 0
       While GetStatus() <> MCH_SIM_ST.UI_STOP
@@ -336,10 +368,15 @@ Public Class SimulationExpanderVM
       End While
       SetSimExecuting(False)
       IniFile.m_bSimulExecuting = False
+      If m_bOnlySimulation Then
+         ' Impedisco salvataggio eventuale modifica stato virtual milling
+         EgtResetModified()
+      Else
          Map.refTopCommandBarVM.DrawIsEnabled = True
          Map.refOperationsListExpanderVM.OpersListViewIsEnabled = True
          Map.refOperationParametersExpanderVM.OperParamsViewIsEnabled = True
-      Map.refMachGroupPanelVM.SetMachGroupState(True) ' Map.refMachGroupPanelVM.MachGroupPanelIsEnabled = 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: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
@@ -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

@@ -9,11 +9,12 @@
                             WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
                             MinWidth="400" MinHeight="382"
-   Width="400" Height="412"
+                            Width="400" Height="575"
                             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">
@@ -25,7 +26,8 @@
                   <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}" 
+                             TextWrapping="Wrap"
                              TextAlignment="Center"/>
                </UniformGrid>
             </GroupBox>
@@ -131,7 +133,6 @@
                </UniformGrid>
             </GroupBox>
          </StackPanel>
-          
       </TabItem>
       <TabItem Header="{Binding ImportMsg}">
          <StackPanel Margin="5,5,5,0">
@@ -153,7 +154,6 @@
                <TextBlock Grid.Row="0" Grid.Column="2" 
                           VerticalAlignment="Center" HorizontalAlignment="Center"  
                           Text="{Binding FactorScaleMsg}"/>
-                    
                <TextBlock Grid.Row="1" Grid.Column="0" 
                           Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
                <ComboBox Grid.Row="1" Grid.Column="1"
@@ -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>
-
-            <Grid Margin="5,5,5,0">
                <Button Content="{Binding ExportMachineMsg}" Command="{Binding ExportMachine_Command}" Height="26" Margin="100,1"/>
-            </Grid>
+            </UniformGrid>
          </StackPanel>
       </TabItem>
 

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)
@@ -386,7 +460,7 @@ Public Class OptionWindowVM
       End Get
       Set(value As String)
          Dim nVal As Integer = 0
-         If Integer.TryParse(value, nVal) AndAlso nVal > 0 Then
+         If Integer.TryParse(value, nVal) Then
             OptionModule.m_nDecDigit = nVal
             EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight)
             WritePrivateProfileString(S_DIMENSIONSTYLE, K_DECDIGIT, OptionModule.m_nDecDigit.ToString())
@@ -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"
@@ -1122,7 +1233,7 @@ Public Class OptionWindowVM
       Dim bUpdate As Boolean = True
       If bOldExists Then
          Dim MachBox As New MachineBox(Application.Current.MainWindow, sMachName)
-         Select MachBox.ShowDialog()
+         Select Case MachBox.ShowDialog()
             Case MessageBoxResult.Yes
                bUpdate = False
             Case MessageBoxResult.No
@@ -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)
@@ -1360,7 +1471,7 @@ Public Class OptionWindowVM
       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)
             Return
@@ -1464,7 +1575,7 @@ Public Class OptionWindowVM
       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)
             Return
@@ -1581,3 +1692,28 @@ Public Class GeomTypeConverter
    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

PopUpGridPanel/PopUpGridPanelV.xaml

@@ -6,6 +6,9 @@
       <Button Command="{Binding CPlaneViewCommand}" ToolTip="{Binding CPlaneViewToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
       </Button>
+      <Button Command="{Binding CPlaneInvertCommand}" ToolTip="{Binding CPlaneInvertToolTip}" Style="{StaticResource GridViewPanelButton}">
+         <Image Source="/Resources/GridViewPanel/CplaneInvert.png" Stretch="Uniform"/>
+      </Button>
       <Button Command="{Binding CPlaneRotateCommand}" ToolTip="{Binding CPlaneRotateToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
       </Button>

PopUpGridPanel/PopUpGridPanelViewModel.vb

@@ -7,6 +7,7 @@ Public Class PopUpGridPanelVM
 
    ' Definizione comandi
    Private m_cmdCPlaneView As ICommand
+   Private m_cmdCPlaneInvert As ICommand
    Private m_cmdCPlaneRotate As ICommand
    Private m_cmdCPlane3P As ICommand
    Private m_cmdCPlanePerpObj As ICommand
@@ -19,6 +20,11 @@ Public Class PopUpGridPanelVM
          Return EgtMsg(MSG_GRIDVIEWPANEL + 25)
       End Get
    End Property
+   Public ReadOnly Property CPlaneInvertToolTip As String
+      Get
+         Return EgtMsg(5285)
+      End Get
+   End Property
    Public ReadOnly Property CPlaneRotateToolTip As String
       Get
          Return EgtMsg(MSG_GRIDVIEWPANEL + 28)
@@ -70,6 +76,29 @@ Public Class PopUpGridPanelVM
 
 #End Region ' CPlaneViewCommand
 
+#Region "CPlaneInvertCommand"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneInvert.
+   ''' </summary>
+   Public ReadOnly Property CPlaneInvertCommand As ICommand
+      Get
+         If m_cmdCPlaneInvert Is Nothing Then
+            m_cmdCPlaneInvert = New RelayCommand(AddressOf CPlaneInvert)
+         End If
+         Return m_cmdCPlaneInvert
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the CPlaneInvert.  This method is invoked by the CPlaneInvertCommand.
+   ''' </summary>
+   Public Sub CPlaneInvert(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_INVERT)
+   End Sub
+
+#End Region
+
 #Region "CPlaneRotateCommand"
 
    ''' <summary>

PopUpViewPanel/PopUpViewPanelV.xaml

@@ -12,9 +12,6 @@
       <Button ToolTip="{Binding ZoomSelToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomSelCommand}">
          <Image Source="/Resources/GridViewPanel/ZoomSel.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding LookFromIso_SEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewSECommand}">
-         <Image Source="/Resources/GridViewPanel/LookFromISO_SE.png" Stretch="Uniform"/>
-      </Button>
       <Button ToolTip="{Binding LookFromIso_NEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNECommand}">
          <Image Source="/Resources/GridViewPanel/LookFromISO_NE.png" Stretch="Uniform"/>
       </Button>

PopUpViewPanel/PopUpViewPanelVM.vb

@@ -9,7 +9,6 @@ Public Class PopUpViewPanelVM
    Private m_cmdZoomIn As ICommand
    Private m_cmdZoomOut As ICommand
    Private m_cmdZoomSel As ICommand
-   Private m_cmdIsoViewSE As ICommand
    Private m_cmdIsoViewNE As ICommand
    Private m_cmdIsoViewNW As ICommand
    Private m_cmdViewToCPlane As ICommand
@@ -34,12 +33,6 @@ Public Class PopUpViewPanelVM
       End Get
    End Property
 
-   Public ReadOnly Property LookFromIso_SEToolTip As String
-      Get
-         Return EgtMsg(MSG_GRIDVIEWPANEL + 13)
-      End Get
-   End Property
-
    Public ReadOnly Property LookFromIso_NEToolTip As String
       Get
          Return EgtMsg(MSG_GRIDVIEWPANEL + 14)
@@ -133,29 +126,6 @@ Public Class PopUpViewPanelVM
 
 #End Region ' ZoomOutCommand
 
-#Region "IsoViewSECommand"
-
-   ''' <summary>
-   ''' Returns a command that do IsoViewSE.
-   ''' </summary>
-   Public ReadOnly Property IsoViewSECommand As ICommand
-      Get
-         If m_cmdIsoViewSE Is Nothing Then
-            m_cmdIsoViewSE = New RelayCommand(AddressOf IsoViewSE)
-         End If
-         Return m_cmdIsoViewSE
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the IsoViewSE.  This method is invoked by the IsoViewSECommand.
-   ''' </summary>
-   Public Sub IsoViewSE(ByVal param As Object)
-      Map.refProjectVM.GetScene.IsoViewSE()
-   End Sub
-
-#End Region ' IsoViewSECommand
-
 #Region "IsoViewNECommand"
 
    ''' <summary>

Project/ProjectVM.vb

@@ -58,6 +58,20 @@ 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"
@@ -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
@@ -231,18 +283,33 @@ Public Class ProjectVM
       SceneHost.Child = Nothing
       ' Se manca la chiave
       If IniFile.m_nKeyLevel = -1 Or IniFile.m_nKeyLevel = -2 Then
+         If Not EgtGetNetHwKey() Then
             EgtOutLog("Missing Dongle")
             ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
+            Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            EgtOutLog("NetDongle is full")
+            ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC."  "Errore"
+            Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111)
+            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
+      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
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : sKeyInfo \n "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
          Dim sKeyInfo As String = "" : EgtGetKeyInfo(sKeyInfo)
-         Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6)
+         Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(10105) & vbCrLf & EgtMsg(10106)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         Dim sTitle As String = EgtMsg(10101)
          If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
             Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
@@ -277,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)
@@ -292,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)
@@ -1084,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 
@@ -1103,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 = ""
-                  If EgtGetInfo(EgtGetParent(nId), "MDir", sInfo) Then
                   m_SelType = DispositionUtility.SelType.BARS
-                     m_nIdToSel = EgtGetParent(nId)
+                  m_nIdToSel = nFixtureId
                   ' Drag possibile
                   m_bDrag = True
-                  End If
+                  Exit While
                End If
             Case SceneSelTypeOpt.RAWPART, SceneSelTypeOpt.RAWPARTWITHFIXTURE
                Dim nRawPartId As Integer = EgtGetParent(nId)
@@ -1172,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
@@ -1375,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
@@ -1390,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()
@@ -1462,6 +1669,15 @@ Public Class ProjectVM
       End If
    End Sub
 
+   Private Sub OnInsertingProject(ByVal sender As Object, nType As Integer, ByRef nFlag As Integer) Handles m_Controller.OnInsertingProject
+      If nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
+         nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then
+         nFlag = GetMainPrivateProfileInt(S_IMPORT, K_ADVFLAG, 0)
+      Else
+         nFlag = 0
+      End If
+   End Sub
+
    Private Sub OnInsertedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnInsertedProject
       EgtZoom(ZM.ALL)
       WritePrivateProfileString(S_GENERAL, K_LASTNGEINSDIR, Path.GetDirectoryName(sFile))
@@ -1502,6 +1718,9 @@ Public Class ProjectVM
             nFlag = GetPrivateProfileInt(S_IMPORT, K_CNCFLAG, EIC_FL.NONE)
          ElseIf nType = FT.BTL Or nType = FT.BTLX Then
             nFlag = GetPrivateProfileInt(S_IMPORT, K_BTLFLAG, EIB_FL.NONE)
+         ElseIf nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
+                nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then
+            nFlag = GetPrivateProfileInt(S_IMPORT, K_ADVFLAG, 0)
          Else
             nFlag = 0
          End If