Merge remote-tracking branch 'origin/master' into feature/ManageNote

- ricompilazione con cambio versione.

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

BottomTray/BottomTrayV.xaml

@@ -0,0 +1,12 @@
+<Grid x:Class="BottomTrayV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+      DockPanel.Dock="Bottom">
+   <EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelViewModel}"
+                                  RepaetButtonStyle="{StaticResource CustomScrollBarButton}"
+                                  MachGroupButtonStyle="{StaticResource {x:Type ToggleButton}}"
+                                  IsToolBar="False"
+                                  IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False"
+                                  IsRightDockable="False" />
+</Grid>

BottomTray/BottomTrayV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class BottomTrayV
+
+End Class

Constants/ConstGen.vb

@@ -22,6 +22,7 @@ Module ConstGen
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "EgtCAM5.lic"
    Public Const S_LICENCE As String = "Licence"
+   Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
 

Constants/ConstIni.vb

@@ -18,6 +18,7 @@ Module ConstIni
    Public Const S_GENERAL As String = "General"
    Public Const K_DEBUG As String = "Debug"
    Public Const K_LICENCE As String = "Licence"
+   Public Const K_NETKEY As String = "NetKey"
    Public Const K_USERLEVEL As String = "UserLevel"
    Public Const K_MAXINST As String = "MaxInstances"
    Public Const K_INSTANCES As String = "Instances"
@@ -28,6 +29,7 @@ Module ConstIni
    Public Const K_HIDEPLACE As String = "HidePlace"
    Public Const K_LASTNGEDIR As String = "LastNgeDir"
    Public Const K_LASTNGEOBJDIR As String = "LastNgeObjDir"
+   Public Const K_LASTNGEINSDIR As String = "LastNgeInsDir"
    Public Const K_LASTLUADIR As String = "LastLuaDir"
    Public Const K_LASTIMPDIR As String = "LastImpDir"
    Public Const K_LASTEXPDIR As String = "LastExpDir"
@@ -37,13 +39,14 @@ Module ConstIni
    Public Const K_TRANSFORM As String = "Transform"
    Public Const K_ONLYDRAW As String = "OnlyDraw"
    Public Const K_SUPPORT As String = "Support"
+   Public Const K_PLUGIN As String = "Plugin"
+   Public Const K_EXECUTE As String = "Execute"
 
    Public Const S_LANGUAGES As String = "Languages"
    Public Const K_LANGUAGE As String = "Language"
 
    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"
 
@@ -105,6 +108,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"
@@ -119,7 +123,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"
@@ -128,7 +131,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"
@@ -168,7 +170,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"
@@ -183,6 +184,7 @@ Module ConstIni
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
    Public Const K_SHOWONLYTABLE As String = "ShowOnlyTable"
    Public Const K_MOVETHROUGHDISPS As String = "MoveThroughDisps"
+   Public Const K_AUTOUPDATEALLMACHININGS As String = "AutoUpdateAllMachinings"
 
    Public Const S_SIMUL As String = "Simul"
    Public Const K_SLIDERX As String = "SliderX"

Constants/ConstMachIni.vb

@@ -33,7 +33,9 @@
    Public Const K_SAWFINISHING As String = "SawFinishing"
    Public Const K_GENMACHINING As String = "GenMachining"
    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_WATERJETTING As String = "WaterJetting"
    Public Const K_SAWINGONARCS As String = "SawingOnArcs"
 

DrawPanel/DrawPanelV.xaml

@@ -1,9 +1,11 @@
-<UserControl x:Class="DrawPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="DrawPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                               xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5">
+                              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+                              TitleBarOrientation="Vertical"
+                              Visibility="{Binding DrawPanel_Visibility}">
 
    <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Expander Name="Draw2D" Style="{StaticResource ExpanderStyle}" Grid.Row="0"
@@ -72,16 +74,26 @@
                Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
-               <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
-            </Button>
             <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding DiamRadDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding DiamRadDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
+               <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
+            </Button>
          </UniformGrid>
       </Expander>
       <Expander Name="Draw3D" Style="{StaticResource ExpanderStyle}" Grid.Row="1"
@@ -175,6 +187,11 @@
                Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding StmMoveVertexFacetToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
+            </Button>
          </UniformGrid>
       </Expander>
       <Expander Name="Modify" Style="{StaticResource ExpanderStyle}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">
@@ -192,8 +209,11 @@
                Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
             </Button>
-            <Button Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
-                    Visibility="Hidden"/>
+               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}">
@@ -352,4 +372,4 @@
       </Interactivity:Interaction.Behaviors>
    </StackPanel>
 
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

DrawPanel/DrawPanelVM.vb

@@ -97,12 +97,22 @@ Public Class DrawPanelVM
    End Property
    Public ReadOnly Property TextToolTip As String
       Get
-         Return EgtMsg( 5214)
+         Return EgtMsg( 5214)       ' Testo<br/>Testo Avanzato (Shift)
       End Get
    End Property
    Public ReadOnly Property LinearDimensionToolTip As String
       Get
-         Return EgtMsg( 5155)
+         Return EgtMsg( 5155)       ' Quota Lineare<br/>Quota Allineata (Shift)
+      End Get
+   End Property
+   Public ReadOnly Property AngularDimensionToolTip As String
+      Get
+         Return EgtMsg( 5167)       ' Quota Angolare<br/>Quota Angolare Avanzata (Shift)
+      End Get
+   End Property
+   Public ReadOnly Property DiamRadDimensionToolTip As String
+      Get
+         Return EgtMsg( 5168)       ' Quota Diametrale<br/>Quota Radiale (Shift)
       End Get
    End Property
 
@@ -151,6 +161,11 @@ Public Class DrawPanelVM
          Return EgtMsg( 5165)         'Approssima Superfici e Regioni Piane
       End Get
    End Property
+   Public ReadOnly Property StmMoveVertexFacetToolTip As String
+      Get
+         Return EgtMsg( 5166)         'Muovi Vertice di Superficie<br/>Muovi Faccia di Superficie (Shift)
+      End Get
+   End Property
    Public ReadOnly Property ExtractSurfFacetToolTip As String
       Get
          Return EgtMsg( 5158)         'Estrai Faccia da Superficie
@@ -202,6 +217,12 @@ Public Class DrawPanelVM
          Return EgtMsg(MSG_DRAWPANEL + 24)
       End Get
    End Property
+   Public ReadOnly Property ChangeStatusToolTip As String
+      Get
+         Return EgtMsg(5250)
+      End Get
+   End Property
+
    Public ReadOnly Property ChangeAlphaToolTip As String
       Get
          Return EgtMsg(MSG_DRAWPANEL + 25)
@@ -393,6 +414,18 @@ Public Class DrawPanelVM
       End Set
    End Property
 
+   Private m_DrawPanel_Visibility As Visibility
+   Public ReadOnly Property DrawPanel_Visibility As Visibility
+      Get
+         Return m_DrawPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetDrawPanelVisibility(bValue As Boolean)
+      m_DrawPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      OnPropertyChanged(NameOf(DrawPanel_Visibility))
+   End Sub
+
+
 #Region "Button state"
 
    Private m_bLayerOk As Boolean
@@ -443,6 +476,8 @@ Public Class DrawPanelVM
    Private m_cmdPolygonSide As ICommand
    Private m_cmdText As ICommand
    Private m_cmdLinDim As ICommand
+   Private m_cmdAngDim As ICommand
+   Private m_cmdDiamRadDim As ICommand
    Private m_cmdModifyCurve As ICommand
    Private m_cmdAddPointCurve As ICommand
    Private m_cmdPlane As ICommand
@@ -454,6 +489,7 @@ Public Class DrawPanelVM
    Private m_cmdMergeSurf As ICommand
    Private m_cmdExplodeSurf As ICommand
    Private m_cmdApproxSurf As ICommand
+   Private m_cmdMoveStmVertexFacet As ICommand
    Private m_cmdExtractSurfFacet As ICommand
    Private m_cmdInvertSurf As ICommand
    Private m_cmdExtractLoops As ICommand
@@ -464,6 +500,7 @@ Public Class DrawPanelVM
    Private m_cmdIntersectSurfSurf As ICommand
    Private m_cmdDelete As ICommand
    Private m_cmdChangeLayer As ICommand
+   Private m_cmdChangeStatus As ICommand
    Private m_cmdChangeAlpha As ICommand
    Private m_cmdResetColor As ICommand
    Private m_cmdChangeColor As ICommand
@@ -702,7 +739,11 @@ Public Class DrawPanelVM
    ''' Execute the Arc3P.  This method is invoked by the Arc3PCommand.
    ''' </summary>
    Public Sub Arc3P(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC2PR)
+      Else
          Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P)
+      End If
    End Sub
 
 #End Region ' Arc3PCommand
@@ -725,13 +766,12 @@ Public Class DrawPanelVM
    ''' Execute the ArcPDP.  This method is invoked by the ArcPDPCommand.
    ''' </summary>
    Public Sub ArcPDP(ByVal param As Object)
-      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-         If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
-            Map.refProjectVM.GetController.SetContinue()
-         End If
-         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP)
-      Else
          Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPVP)
+      ElseIf (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+         Map.refProjectVM.GetController.SetContinue()
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP)
       End If
    End Sub
 
@@ -860,6 +900,60 @@ Public Class DrawPanelVM
 
 #End Region ' LinearDimensionCommand
 
+#Region "AngularDimensionCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Angular Dimension.
+   ''' </summary>
+   Public ReadOnly Property AngularDimensionCommand As ICommand
+      Get
+         If m_cmdAngDim Is Nothing Then
+            m_cmdAngDim = New RelayCommand(AddressOf AngularDimension)
+         End If
+         Return m_cmdAngDim
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the AngularDimension.  This method is invoked by the AngDimCommand.
+   ''' </summary>
+   Public Sub AngularDimension(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ANGULARDIMENSIONPLUS)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ANGULARDIMENSION)
+      End If
+   End Sub
+
+#End Region ' AngularDimensionCommand
+
+#Region "DiamRadDimensionCommand"
+
+   ''' <summary>
+   ''' Returns a command that do DiamRad Dimension.
+   ''' </summary>
+   Public ReadOnly Property DiamRadDimensionCommand As ICommand
+      Get
+         If m_cmdDiamRadDim Is Nothing Then
+            m_cmdDiamRadDim = New RelayCommand(AddressOf DiamRadDimension)
+         End If
+         Return m_cmdDiamRadDim
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the DiamRadDimension.  This method is invoked by the DiamRadDimCommand.
+   ''' </summary>
+   Public Sub DiamRadDimension(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RADIALDIMENSION)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.DIAMETRALDIMENSION)
+      End If
+   End Sub
+
+#End Region ' DiamRadDimensionCommand
+
 #Region "ModifyCurve"
 
    ''' <summary>
@@ -1183,6 +1277,33 @@ Public Class DrawPanelVM
 
 #End Region ' ApproxSurfCommand
 
+#Region "MoveStmVertexFacetCommand"
+
+   ''' <summary>
+   ''' Returns a command that do MoveStmVertex.
+   ''' </summary>
+   Public ReadOnly Property MoveStmVertexFacetCommand As ICommand
+      Get
+         If m_cmdMoveStmVertexFacet Is Nothing Then
+            m_cmdMoveStmVertexFacet = New RelayCommand(AddressOf MoveStmVertexFacet)
+         End If
+         Return m_cmdMoveStmVertexFacet
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the MoveStmVertexFacet.  This method is invoked by the MoveStmVertexFacetCommand.
+   ''' </summary>
+   Public Sub MoveStmVertexFacet(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MOVESURFFACET)
+      Else
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MOVESURFVERTEX)
+      End If
+   End Sub
+
+#End Region ' MoveStmVertexFacetCommand
+
 #Region "ExtractSurfFacetCommand"
 
    ''' <summary>
@@ -1426,6 +1547,41 @@ Public Class DrawPanelVM
 
 #End Region ' ChangeLayerCommand
 
+#Region "ChangeStatusCommand"
+
+   ''' <summary>
+   ''' Returns a command that do ChangeStatus.
+   ''' </summary>
+   Public ReadOnly Property ChangeStatusCommand As ICommand
+      Get
+         If m_cmdChangeStatus Is Nothing Then
+            m_cmdChangeStatus = New RelayCommand(AddressOf ChangeStatus)
+         End If
+         Return m_cmdChangeStatus
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the ChangeStatus.  This method is invoked by the ChangeStatusCommand.
+   ''' </summary>
+   Public Sub ChangeStatus(ByVal param As Object)
+      If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SELPART)
+         Map.refProjectVM.GetController.SetLastBoolean( True)
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
+      ElseIf (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SELLAYER)
+         Map.refProjectVM.GetController.SetLastBoolean( True)
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
+      Else
+         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SEL)
+         Map.refProjectVM.GetController.SetLastBoolean( False)
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
+      End If
+   End Sub
+
+#End Region ' ChangeStatusCommand
+
 #Region "ChangeAlphaCommand"
 
    ''' <summary>

EgtCAM5.vbproj

@@ -97,6 +97,9 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DotNetZip">
+      <HintPath>..\..\EgtProg\EgtCAM5\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EgtUILib, Version=2.4.6.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
@@ -109,13 +112,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
     </Reference>
-    <Reference Include="Ionic.Zip">
-      <HintPath>..\..\EgtProg\EgtCAM5\Ionic.Zip.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\EgtProg\EgtCAM5\Microsoft.Expression.Interactions.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -153,11 +154,18 @@
     <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
       <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="BottomTray\BottomTrayV.xaml.vb">
+      <DependentUpon>BottomTrayV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="CurrSetUp\CurrSetUpV.xaml.vb">
       <DependentUpon>CurrSetUpV.xaml</DependentUpon>
     </Compile>
     <Compile Include="CurrSetUp\CurrSetUpVM.vb" />
+    <Compile Include="LeftTray\LeftTrayV.xaml.vb">
+      <DependentUpon>LeftTrayV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
+    <Compile Include="MEFPlugin\MefPlugin.vb" />
     <Compile Include="OptionPanel\MachiningOptionPanel\EstimationsExpander\EstimationsExpanderV.xaml.vb">
       <DependentUpon>EstimationsExpanderV.xaml</DependentUpon>
     </Compile>
@@ -227,6 +235,12 @@
     <Compile Include="OptionsWindow\MachineBox.xaml.vb">
       <DependentUpon>MachineBox.xaml</DependentUpon>
     </Compile>
+    <Compile Include="RightTray\RightTrayV.xaml.vb">
+      <DependentUpon>RightTrayV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SceneContentControl\SceneContentControlV.xaml.vb">
+      <DependentUpon>SceneContentControlV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SetUpDb\SetUpDbV.xaml.vb">
       <DependentUpon>SetUpDbV.xaml</DependentUpon>
     </Compile>
@@ -236,10 +250,6 @@
       <DependentUpon>SetUpV.xaml</DependentUpon>
     </Compile>
     <Compile Include="SetUp\SetUpVM.vb" />
-    <Compile Include="Special-3dPrinting\Printing3DPanelV.xaml.vb">
-      <DependentUpon>Printing3DPanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Special-3dPrinting\Printing3DPanelVM.vb" />
     <Compile Include="Special-BeamWall\Beam.vb" />
     <Compile Include="Command\Command.vb" />
     <Compile Include="Command\RelayCommand.vb" />
@@ -278,7 +288,11 @@
     </Compile>
     <Compile Include="StatusBar\MyStatusBarVM.vb" />
     <Compile Include="ToolsDbWindow\MyToolDbWindowVM.vb" />
+    <Compile Include="TopTray\TopTrayV.xaml.vb">
+      <DependentUpon>TopTrayV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Utility\Analyze.vb" />
+    <Compile Include="Utility\BasePanelVM.vb" />
     <Compile Include="Utility\BindingProxy.vb" />
     <Compile Include="Utility\Map.vb" />
     <Compile Include="Internals\MruList.vb" />
@@ -416,6 +430,10 @@
     <Compile Include="Utility\Utility.vb" />
     <Compile Include="Utility\VMBase.vb" />
     <Compile Include="ValidationGroup.vb" />
+    <Compile Include="WinFormPluginControl\WinFormPluginControlVM.vb" />
+    <Compile Include="WinFormPluginControl\WinFormPluginControlV.xaml.vb">
+      <DependentUpon>WinFormPluginControlV.xaml</DependentUpon>
+    </Compile>
     <Page Include="AboutBoxWindow\AboutBoxView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -424,6 +442,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="BottomTray\BottomTrayV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="CurrSetUp\CurrSetUpV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -432,6 +454,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="LeftTray\LeftTrayV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MachOptionsWindow\MachOptionV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -520,6 +546,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="RightTray\RightTrayV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SceneContentControl\SceneContentControlV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SetUpDb\SetUpDbV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -528,10 +562,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Special-3dPrinting\Printing3DPanelV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Special-BeamWall\BeamWallPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -588,6 +618,10 @@
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
+    <Page Include="TopTray\TopTrayV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Utility\Dictionary.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -680,6 +714,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="WinFormPluginControl\WinFormPluginControlV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Import Include="System.Linq" />
@@ -729,7 +767,6 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
     <AppDesigner Include="My Project\" />
-    <None Include="packages.config" />
     <Resource Include="Resources\Fonts\gothic.ttf" />
   </ItemGroup>
   <ItemGroup>
@@ -962,6 +999,28 @@
   <ItemGroup>
     <Resource Include="Resources\TopCommandBar\Print.png" />
   </ItemGroup>
+  <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>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe

ExecutePanel/ExecutePanelV.xaml

@@ -1,6 +1,8 @@
-<UserControl x:Class="ExecutePanelV"
+<EgtFloating:EgtFloatingPanel x:Class="ExecutePanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding ExecutePanel_Visibility}">
 
    <StackPanel Orientation="Horizontal">
       <Button Command="{Binding ExecCommand}" ToolTip="{Binding ExecToolTip}"
@@ -13,4 +15,4 @@
       </Button>
    </StackPanel>
 
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

ExecutePanel/ExecutePanelVM.vb

@@ -12,6 +12,18 @@ Public Class ExecutePanelVM
       End Get
    End Property
 
+   Private m_ExecutePanel_Visibility As Visibility
+   Public ReadOnly Property ExecutePanel_Visibility As Visibility
+      Get
+         Return m_ExecutePanel_Visibility
+      End Get
+   End Property
+
+   Friend Sub SetExecutePanelVisibility(bValue As Boolean)
+      m_ExecutePanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      OnPropertyChanged(NameOf(ExecutePanel_Visibility))
+   End Sub
+
    ' Definizione comandi
    Private m_cmdExec As ICommand
    Private Shared m_cmdOpenMruScript As ICommand
@@ -28,6 +40,11 @@ Public Class ExecutePanelVM
 
 #End Region    ' FIELDS & PROPERTIES
 
+   Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefExecutePanelVM(Me)
+   End Sub
+
 #Region "COMMANDS"
 
 #Region "ExecCommand"

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

@@ -0,0 +1,9 @@
+<Grid x:Class="LeftTrayV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:local="clr-namespace:EgtCAM5"
+      DockPanel.Dock="Left">
+   
+   <local:DrawPanelV DataContext="{StaticResource DrawPanelViewModel}"/>
+   
+</Grid>

LeftTray/LeftTrayV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class LeftTrayV
+
+End Class

MEFPlugin/MefPlugin.vb

@@ -0,0 +1,74 @@
+Imports System.ComponentModel.Composition
+Imports System.ComponentModel.Composition.hosting
+
+Public Class MEFLoader
+   Private importers As Dictionary(Of String, List(Of Object)) = New Dictionary(Of String, List(Of Object))()
+
+   Public Overridable Function LoadByTag(Of T)(ByVal path As String, ByVal tag As String) As ICollection(Of T)
+      Dim importer = GetImporter(Of T)(path)
+      Return importer.LoadByMEF(path, tag)
+   End Function
+
+   Protected Function GetImporter(Of T)(ByVal path As String) As MEFImporter(Of T)
+      Dim importerList = GetImporterList(path)
+      Dim importer = importerList.OfType(Of MEFImporter(Of T))().FirstOrDefault()
+
+      If importer Is Nothing Then
+         importer = New MEFImporter(Of T)(path)
+         importerList.Add(importer)
+      End If
+
+      Return importer
+   End Function
+
+   Protected Function GetImporterList(ByVal path As String) As List(Of Object)
+      If importers.ContainsKey(path) = False Then importers.Add(path, New List(Of Object)())
+      Return importers(path)
+   End Function
+
+   Public Overridable Function LoadByType(Of T)(ByVal path As String) As ICollection(Of T)
+      Return LoadByTag(Of T)(path, String.Empty)
+   End Function
+End Class
+
+Public Interface IMetadata
+   ReadOnly Property Name As String
+End Interface
+
+Public Class MEFImporter(Of T)
+
+   <ImportMany(AllowRecomposition:=True)>
+   Public Property [imports] As IEnumerable(Of Lazy(Of T, IMetadata))
+
+   Private Sub New()
+   End Sub
+
+   Public Sub New(ByVal path As String)
+      Me.New()
+      directoryCatalog = New DirectoryCatalog(path)
+   End Sub
+
+   Protected directoryCatalog As DirectoryCatalog = Nothing
+
+   Protected Sub DoImport(ByVal path As String)
+      Dim catalog = New AggregateCatalog()
+      catalog.Catalogs.Add(directoryCatalog)
+      Dim container As CompositionContainer = New CompositionContainer(catalog)
+      container.ComposeParts(Me)
+   End Sub
+
+   Public Function LoadByMEF(ByVal path As String, ByVal name As String) As ICollection(Of T)
+      Dim res = New List(Of T)()
+      DoImport(path)
+
+      For Each [module] As Lazy(Of T, IMetadata) In [imports]
+
+         If [module].Metadata.Name = name OrElse String.IsNullOrEmpty(name) Then
+            res.Add([module].Value)
+         End If
+      Next
+
+      Return res
+   End Function
+
+End Class

MachGroupPanel/MyMachGroupPanelVM.vb

@@ -1,5 +1,8 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
+Imports EgtCAM5.MyMachinePanelVM
+Imports System.Security.Cryptography
+Imports System.Windows.Forms.AxHost
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -115,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)
@@ -161,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
@@ -193,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()
@@ -309,15 +333,36 @@ Public Class MyMachGroupPanelVM
 #End Region
 
    Public Overrides Sub AddMachGroup()
-      'If AddNewMachGroup() Then
+   
-      '   Dim sMachName As String = String.Empty
+      Dim nNewMachGrpId As Integer = GDB_ID.NULL
-      '   EgtGetMachGroupName(EgtGetCurrMachGroup(), sMachName)
+      Dim sNewMachGrpName As String = ""
-      '   MachGroupList.Add(sMachName)
+
-      '   SelectedMachGroup = sMachName
+      ' Se premuto Shift, copio il gruppo corrente
-      '   EgtDraw()
+      If (Keyboard.Modifiers And Input.ModifierKeys.Shift) = Input.ModifierKeys.Shift Then
-      '   Map.refOperationsListExpanderVM.LoadOperationList(GDB_ID.NULL)
+         ' Eseguo una copia del gruppo corrente
-      '   Map.refOperationsListExpanderVM.UpdateCurrentMachine()
+         Dim sMachGrpName As String = ""
-      'End If
+         If Not EgtGetMachGroupName(EgtGetCurrMachGroup(), sMachGrpName) Then Return 
+         sNewMachGrpName = "Mach_1"
+         EgtGetMachGroupNewName(sNewMachGrpName)
+         nNewMachGrpId = EgtCopyMachGroup(sMachGrpName, sNewMachGrpName)
+      ' altrimenti ne aggiungo uno vuoto
+      Else
+         Dim vPart As New List(Of Integer)
+         AddNewMachGroup(nNewMachGrpId, vPart)
+         EgtGetMachGroupName(nNewMachGrpId, sNewMachGrpName)
+      End If
+
+      ' Se creazione non riuscita, esco subito
+      If nNewMachGrpId = GDB_ID.NULL Then Return
+      ' altrimenti sistemo interfaccia
+      Dim sMachine As String = String.Empty
+      EgtGetMachGroupMachineName(nNewMachGrpId, sMachine)
+      Dim machGroup As New MachGroup(nNewMachGrpId, sNewMachGrpName, sMachine)
+      MachGroupList.Add(machGroup)
+      SelectedMachGroup = machGroup
+      Map.refMachGroupPanelVM.SetMachGroupState(True)
+
+      EgtZoom(ZM.ALL)
    End Sub
 
    Public Overrides Sub RemoveMachGroup()

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

@@ -1,6 +1,8 @@
-<UserControl x:Class="MachinePanelV"
+<EgtFloating:EgtFloatingPanel x:Class="MachinePanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding MachinePanel_Visibility}">
 
    <StackPanel Orientation="Horizontal">
       <!--Combobox per selezionare la macchina corrente-->
@@ -32,4 +34,4 @@
       </Button>
     </StackPanel>
 
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

MachinePanel/MyMachinePanelVM.vb

@@ -82,6 +82,17 @@ Public Class MyMachinePanelVM
       End Set
    End Property
 
+   Private m_MachinePanel_Visibility As Visibility
+   Public ReadOnly Property MachinePanel_Visibility As Visibility
+      Get
+         Return m_MachinePanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetMachinePanelVisibility(bValue As Boolean)
+      m_MachinePanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(MachinePanel_Visibility))
+   End Sub
+
 #Region "Messages"
 
    Public ReadOnly Property ToolDBMsg As String
@@ -283,6 +294,7 @@ Public Class MyMachinePanelVM
          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

@@ -4,7 +4,7 @@
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
    xmlns:local="clr-namespace:EgtCAM5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+   Title="{Binding Title}" Icon="{Binding IconSource}"
    TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
    BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
    MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"

MainWindow/MainWindowVM.vb

@@ -4,6 +4,7 @@ Imports System.Windows.Threading
 Imports System.Runtime.InteropServices
 Imports System.Math
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class MainWindowVM
    Inherits ViewModelBase
@@ -14,6 +15,7 @@ Public Class MainWindowVM
    Private m_objMutex As Mutex
    Private m_sDataRoot As String = String.Empty
    Private m_sConfigDir As String = String.Empty
+   Private m_OnTerminateProcessCallback As New OnTerminateProcessCallback(AddressOf OnTerminateProcess)
 
    ' EGALTECH ENVIRONMENT FIELDS WITH PROPERTY
 
@@ -93,6 +95,16 @@ Public Class MainWindowVM
       End Get
    End Property
 
+   Public ReadOnly Property IconSource As String
+      Get
+         #If PLATFORM = "x64" Then
+            Return "/Resources/EgtCAM5_64.ico"
+         #else
+            Return "/Resources/EgtCAM5.ico"
+         #End If
+      End Get
+   End Property
+
 #End Region
 
 #Region "CONSTRUCTOR"
@@ -191,6 +203,19 @@ Public Class MainWindowVM
       End If
    End Sub
 
+   Private Function OnTerminateProcess( nExitCode As Integer) As Boolean
+      ' Aggiorno istanze usate
+      m_objMutex.WaitOne(1000)
+      Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
+      nTmp -= (1 << (IniFile.m_nInstance - 1))
+      WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
+      m_objMutex.ReleaseMutex()
+      ' Rilascio mutex
+      If Not IsNothing(m_objMutex) Then m_objMutex.Close()
+      ' Dichiaro di procedere con la terminazione del programma
+      Return True
+   End Function
+
 #End Region ' CloseApplicationCommand
 
 #Region "cmdMainWindow_ContentRendered"
@@ -332,10 +357,7 @@ Public Class MainWindowVM
       ' Impostazione direttorio toolmakers
       Dim sToolMakersDir As String = String.Empty
       GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR, "", sToolMakersDir)
-      #If PLATFORM = "x64" Then
+      If Not String.IsNullOrWhiteSpace(sToolMakersDir) Then
-         GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR64, sToolMakersDir, sToolMakersDir)
-      #End If
-      If Not String.IsNullOrWhiteSpace( sToolMakersDir) Then
          IniFile.m_sToolMakersDir = sToolMakersDir
       Else
          IniFile.m_sToolMakersDir = m_sDataRoot & "\" & TOOLMAKER_DFL_DIR
@@ -346,19 +368,29 @@ Public Class MainWindowVM
       EgtSetLockType(KEY_TYPE.HW)
       ' Leggo e imposto chiave di protezione ed eventuale chiave nesting
       Dim sLicFileName As String = ""
-      GetPrivateProfileString( S_GENERAL, K_LICENCE, LIC_FILE_NAME, sLicFileName)
+      GetPrivateProfileString(S_GENERAL, K_LICENCE, LIC_FILE_NAME, sLicFileName)
       Dim sLicFile As String = m_sConfigDir & "\" & sLicFileName
       Dim sKey As String = ""
-      EgtUILib.GetPrivateProfileString( S_LICENCE, K_KEY, "", sKey, sLicFile)
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
-      EgtSetKey( sKey)
+      EgtSetKey(sKey)
       Dim sNestKey As String = ""
-      EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
-      EgtSetNestKey( sNestKey)
+      EgtSetNestKey(sNestKey)
+      ' Impostazioni per chiave di rete
+      Dim bNetKey As Boolean = (GetPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
+      EgtSetNetHwKey(bNetKey)
+      Dim sLockId As String = ""
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_LOCKID, "", sLockId, sLicFile)
+      If Not String.IsNullOrEmpty(sLockId) Then
+         EgtSetLockId(sLockId)
+      End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2505, 1, IniFile.m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2605, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2505, 1, IniFile.m_nKeyOptions)
+                            EgtGetKeyOptions(3279, 2605, 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
+      MachineUtility.EnableAdvMachinings = IniFile.IsKeyEnabledAdvancedMachining()
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sVersion = My.Application.Info.Version.Major.ToString() & "." &
@@ -371,6 +403,7 @@ Public Class MainWindowVM
                               " Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" & DebugLevel().ToString() & vbLf &
                               My.Application.Info.Title.ToString() & " ver. " & m_sVersion
       EgtInit(m_nDebug, IniFile.m_sLogFile, sLogMsg)
+      EgtSetOnTerminateProcess( m_OnTerminateProcessCallback)
       EgtSetUserLevel( IniFile.m_nUserLevel)
       ' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione)
       Dim sMsgDir As String = String.Empty
@@ -400,9 +433,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)
@@ -544,7 +574,7 @@ Public Class MainWindowVM
          WritePrivateProfileString(S_GRID, K_SNAPSTEPINCH, DoubleToString(IniFile.dSnapStepInch, 4))
       End If
       ' gestisco la chiusura di DrawPanelVM
-      If Not IniFile.m_bFailedRun Then
+      If Not IniFile.m_bFailedRun AndAlso Not IsNothing(Map.refDrawPanelVM) Then
          WritePrivateProfileString(S_GENERAL, K_DRAW2D, If(Map.refDrawPanelVM.Draw2DIsExpanded, "1", "0"))
          WritePrivateProfileString(S_GENERAL, K_DRAW3D, If(Map.refDrawPanelVM.Draw3DIsExpanded, "1", "0"))
          WritePrivateProfileString(S_GENERAL, K_MODIFY, If(Map.refDrawPanelVM.ModifyIsExpanded, "1", "0"))
@@ -556,7 +586,7 @@ Public Class MainWindowVM
 
 #Region "Events"
 
-   Private Sub MainWindow_KeyDown(ByVal sender As System.Object, ByVal e As KeyEventArgs)
+   Private Sub MainWindow_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs)
       ' Con ESC esco dall'azione corrente
       If e.Key = Key.Escape Then
          ' reset Azione corrente
@@ -582,4 +612,53 @@ Public Class MainWindowVM
 
 #End Region
 
+#Region "MEF Plugin"
+
+   Private m_Loader As MEFLoader = New MEFLoader()
+
+   Private Function GetPathByName(ByVal name As String) As String
+      Dim PluginNameSplit() As String = name.Split("."c)
+      Dim res = Map.refMainWindowVM.m_sDataRoot & "\Plugin\" & PluginNameSplit(0)
+      Return res
+   End Function
+
+   Friend Function GetControlByName(Of T)(Element As PluginControl) As Panel
+      Dim PlugInControl As Object = m_Loader.LoadByTag(Of T)(GetPathByName(Element.Name), Element.Name).FirstOrDefault()
+      Dim PluginPanel As Panel = Nothing
+      Select Case PlugInControl.GetType().BaseType.FullName
+         Case GetType(Panel).FullName, GetType(Grid).FullName
+            PluginPanel = TryCast(PlugInControl, Panel)
+         Case GetType(Forms.UserControl).FullName
+            Dim PluginUserControl As Forms.UserControl = TryCast(PlugInControl, Forms.UserControl)
+            Dim PluginControlInterface As IPluginControl = TryCast(PlugInControl, IPluginControl)
+            If Not IsNothing(PluginControlInterface) Then
+               AddHandler PluginControlInterface.UpdateProjectName, AddressOf UpdateProjectName
+               AddHandler PluginControlInterface.UpdateUI, AddressOf UpdateUI
+            End If
+            PluginPanel = New WinFormPluginControlV(New WinFormPluginControlVM(PluginUserControl, Element.ViewPanelState))
+      End Select
+      Return PluginPanel
+   End Function
+
+   Friend Function GetConfigData(Of T)(ByVal name As String) As IPluginConfigData
+      Dim PlugInControl As Object = m_Loader.LoadByTag(Of T)(GetPathByName(name), name).FirstOrDefault()
+      Dim PluginConfigData As IPluginConfigData = Nothing
+      Dim v = PlugInControl.GetType()
+      If PlugInControl.GetType().Name = PLUGIN_CONFIGURATION_DATA Then
+         Return TryCast(PlugInControl, IPluginConfigData)
+      Else
+         Return Nothing
+      End If
+   End Function
+
+   Private Sub UpdateProjectName(ProjectName As String)
+      Map.refMainWindowVM.Title = ProjectName & " - EgtCAM5"
+   End Sub
+
+   Private Sub UpdateUI()
+      Map.refProjectVM.UpdateProjectUI(True)
+   End Sub
+
+#End Region    ' MEF Plugin
+
 End Class

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

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/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb

@@ -107,24 +107,6 @@ Public Class EstimationsExpanderVM
       Return True
    End Function
 
-
-   Private Function UpdateAllMachinings() As Boolean
-      ' Eseguo ricalcolo
-      Dim bModified As Boolean = EgtGetModified()
-      Dim sErr As String = String.Empty
-      Dim bOk As Boolean = EgtApplyAllMachinings(False, False, sErr)
-      ' In caso di errori, li segnalo
-      If Not bOk Then
-         If Not String.IsNullOrEmpty(sErr) Then
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         Else
-            MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
-      End If
-      If Not bModified Then EgtResetModified()
-      Return bOk
-   End Function
-
    Public Overrides Function GetEstimationFileName(bAskSave As Boolean, ByRef sEstFile As String, ByRef sInfo As String) As Boolean
       Dim bOk As Boolean = True
       ' Recupero e verifico la path del progetto corrente
@@ -177,7 +159,7 @@ Public Class EstimationsExpanderVM
       ' Recupero la fase corrente
       Dim nPhase As Integer = EgtGetCurrPhase()
       ' Aggiorno le lavorazioni
-      If Not UpdateAllMachinings() Then
+      If Not Map.refSimulationExpanderVM.UpdateAllMachinings() Then
          EgtSetCurrPhase(If(nPhase = 0, 1, nPhase), True)
          Return False
       End If

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderV.xaml

@@ -15,8 +15,6 @@
       <Expander Header="RawPart" IsExpanded="{Binding RawPartIsExpanded}"
          Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
          <StackPanel>
-            <!--<CheckBox Content="Move with Fixture" IsChecked="{Binding MoveWithFixture, Mode=TwoWay}"/>-->
-            <!--ContentPresenter that contains the RawPart options -->
             <ContentPresenter Name="RawPartOptions" Content="{Binding RawPartOptions ,Mode=OneWay}"/>
          </StackPanel>
       </Expander>

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb

@@ -59,7 +59,7 @@ Public Class DispositionParameterExpanderVM
                PartIsExpanded = False
                FixtureIsExpanded = False
                ' verifico se è attiva l'opzione muovi con ventose
-               If m_MoveWithFixture Then
+               If Map.refRawPartOptionVM.MoveWithFixture() Then
                   ' Abilito la selezione dei RawPart con ventose
                   Map.refProjectVM.SceneSelType = SceneSelTypeOpt.RAWPARTWITHFIXTURE
                Else
@@ -168,42 +168,6 @@ Public Class DispositionParameterExpanderVM
       End Set
    End Property
 
-   Private m_MoveWithFixture As Boolean = False
-   Public Property MoveWithFixture As Boolean
-      Get
-         Return m_MoveWithFixture
-      End Get
-      Set(value As Boolean)
-         If value <> m_MoveWithFixture Then
-            If value Then
-               ' Abilito la selezione di RawPart con autoselezione delle sue ventose
-               Map.refProjectVM.SceneSelType = SceneSelTypeOpt.RAWPARTWITHFIXTURE
-               ' Seleziono le ventose associate ad uno dei grezzi selezionati
-               ' ciclo sui grezzi selezionati
-               Dim nSelRawPartId As Integer = EgtGetFirstSelectedObj()
-               While nSelRawPartId <> GDB_ID.NULL
-                  ' seleziono i sottopezzi del grezzo
-                  DispositionUtility.SelectRawPartFixture(nSelRawPartId)
-                  nSelRawPartId = EgtGetNextSelectedObj()
-               End While
-            Else
-               ' Abilito la selezione di RawPart
-               Map.refProjectVM.SceneSelType = SceneSelTypeOpt.RAWPART
-               ' ciclo sui grezzi selezionati
-               Dim nSelRawPartId As Integer = EgtGetFirstSelectedObj()
-               While nSelRawPartId <> GDB_ID.NULL
-                  ' deseleziono i sottopezzi del grezzo
-                  DispositionUtility.DeselectRawPartFixture(nSelRawPartId)
-                  nSelRawPartId = EgtGetNextSelectedObj()
-               End While
-            End If
-            EgtDraw()
-            m_MoveWithFixture = value
-            OnPropertyChanged("MoveWithFixture")
-         End If
-      End Set
-   End Property
-
    Private m_InputValue As String
    Public Property InputValue As String
       Get
@@ -315,8 +279,7 @@ Public Class DispositionParameterExpanderVM
             ' Abilito la selezione delle Fixture
             Map.refProjectVM.SceneSelType = SceneSelTypeOpt.FIXTURE
       End Select
-      m_MoveWithFixture = False
+      Map.refRawPartOptionVM.SetMoveWithFixture(False)
-      OnPropertyChanged("MoveWithFixture")
       Map.refFixtureParametersVM.UpdateFixtureTypeList()
    End Sub
 

OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.ComponentModel
+Imports EgtUILib
 
 Public Class RawPartOptionVM
    Inherits ViewModelBase
@@ -38,6 +39,11 @@ Public Class RawPartOptionVM
          End If
       End Set
    End Property
+   friend Sub SetMoveWithFixture(value As Boolean)
+      m_MoveWithFixture=value
+      OnPropertyChanged(NameOf(MoveWithFixture))
+   End Sub
+
 
    Private m_bRawPartParamVisibility As Visibility
    Public ReadOnly Property RawPartParamVisibility As Visibility
@@ -86,6 +92,7 @@ Public Class RawPartOptionVM
    Private m_cmdRemoveRawPart As ICommand
 
    Sub New()
+      Map.SetRefRawPartOptionVM(Me) 
       If EgtGetFirstSelectedObj() <> GDB_ID.NULL Then
          m_bRawPartParamVisibility = Visibility.Visible
       Else

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.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}"
@@ -343,38 +395,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/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/MachiningParameterExpanderVM.vb

@@ -106,21 +106,21 @@ Public Class MachiningParameterExpanderVM
          EgtGetMachiningParam(MCH_MP.TYPE, nType)
          m_CurrOperation = New MachiningTreeViewItem(sName, DirectCast(nType, MCH_MY))
 
-         WoodDrillParamExpanderV.DataContext = Nothing
+         'WoodDrillParamExpanderV.DataContext = Nothing
-         WoodSawParamExpanderV.DataContext = Nothing
+         'WoodSawParamExpanderV.DataContext = Nothing
-         WoodMillParamExpanderV.DataContext = Nothing
+         'WoodMillParamExpanderV.DataContext = Nothing
-         BeamMillParamExpanderV.DataContext = Nothing
+         'BeamMillParamExpanderV.DataContext = Nothing
-         PocketParamExpanderV.DataContext = Nothing
+         'PocketParamExpanderV.DataContext = Nothing
-         MortiseParamExpanderV.DataContext = Nothing
+         'MortiseParamExpanderV.DataContext = Nothing
-         GenMachinParamExpanderV.DataContext = Nothing
+         'GenMachinParamExpanderV.DataContext = Nothing
-         ChiselParamExpanderV.DataContext = Nothing
+         'ChiselParamExpanderV.DataContext = Nothing
-         StoneSawParamExpanderV.DataContext = Nothing
+         'StoneSawParamExpanderV.DataContext = Nothing
-         StoneSawFinishParamExpanderV.DataContext = Nothing
+         'StoneSawFinishParamExpanderV.DataContext = Nothing
-         StoneSawRoughParamExpanderV.DataContext = Nothing
+         'StoneSawRoughParamExpanderV.DataContext = Nothing
-         StoneMillParamExpanderV.DataContext = Nothing
+         'StoneMillParamExpanderV.DataContext = Nothing
-         StoneDrillParamExpanderV.DataContext = Nothing
+         'StoneDrillParamExpanderV.DataContext = Nothing
-         SurfFinishParamExpanderV.DataContext = Nothing
+         'SurfFinishParamExpanderV.DataContext = Nothing
-         WjParamExpanderV.DataContext = Nothing
+         'WjParamExpanderV.DataContext = Nothing
 
          m_CurrOperation.ReadOperationParam()
 
@@ -136,35 +136,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,21 +189,27 @@ 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
          End Select
@@ -243,21 +258,21 @@ Public Class MachiningParameterExpanderVM
    Sub New()
       EgtWPFLib5.MachiningDbWindowVM.m_sMachineIniPath = IniFile.m_sCurrMachIniFilePath
 
-      WoodDrillParamExpanderV = New WoodDrillingParameterExpanderV
+      'WoodDrillParamExpanderV = New WoodDrillingParameterExpanderV
-      WoodSawParamExpanderV = New WoodSawingParameterExpanderV
+      'WoodSawParamExpanderV = New WoodSawingParameterExpanderV
-      WoodMillParamExpanderV = New WoodMillingParameterExpanderV
+      'WoodMillParamExpanderV = New WoodMillingParameterExpanderV
-      BeamMillParamExpanderV = New BeamMillingParameterExpanderV
+      'BeamMillParamExpanderV = New BeamMillingParameterExpanderV
-      PocketParamExpanderV = New PocketingParameterExpanderV
+      'PocketParamExpanderV = New PocketingParameterExpanderV
-      MortiseParamExpanderV = New MortisingParameterExpanderV
+      'MortiseParamExpanderV = New MortisingParameterExpanderV
-      GenMachinParamExpanderV = New GenMachiningParameterExpanderV
+      'GenMachinParamExpanderV = New GenMachiningParameterExpanderV
-      ChiselParamExpanderV = New ChiselingParameterExpanderV
+      'ChiselParamExpanderV = New ChiselingParameterExpanderV
-      StoneSawParamExpanderV = New StoneSawingParameterExpanderV
+      'StoneSawParamExpanderV = New StoneSawingParameterExpanderV
-      StoneSawFinishParamExpanderV = New StoneSawFinishingParameterExpanderV
+      'StoneSawFinishParamExpanderV = New StoneSawFinishingParameterExpanderV
-      StoneSawRoughParamExpanderV = New StoneSawRoughingParameterExpanderV
+      'StoneSawRoughParamExpanderV = New StoneSawRoughingParameterExpanderV
-      StoneMillParamExpanderV = New StoneMillingParameterExpanderV
+      'StoneMillParamExpanderV = New StoneMillingParameterExpanderV
-      StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
+      'StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
-      SurfFinishParamExpanderV = New SurfFinishingParameterExpanderV
+      'SurfFinishParamExpanderV = New SurfFinishingParameterExpanderV
-      WjParamExpanderV = New WaterjettingParameterExpanderV
+      'WjParamExpanderV = New WaterjettingParameterExpanderV
 
       NotifyPropertyChanged("ParamExpanderPageV")
    End Sub

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/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/OperationListBoxItem.vb

@@ -63,6 +63,7 @@ Public Class OperationListBoxItem
                Dim bEnabModif As Boolean = EgtGetEnableModified()
                EgtDisableModified()
                EgtResetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_CL))
+               EgtResetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_DBL))
                EgtSetStatus(EgtGetFirstNameInGroup(Id, MCH_MGR_AUXVIEW), GDB_ST.OFF)
                SelData.ClearIdSub()
                If bEnabModif Then EgtEnableModified()
@@ -96,6 +97,7 @@ Public Class OperationListBoxItem
                Dim bEnabModif As Boolean = EgtGetEnableModified()
                EgtDisableModified()
                EgtSetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_CL))
+               EgtSetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_DBL))
                EgtSetStatus(EgtGetFirstNameInGroup(Id, MCH_MGR_AUXVIEW), GDB_ST.ON_)
                If bEnabModif Then EgtEnableModified()
                ' Seleziono la geometria della lavorazione

OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb

@@ -723,6 +723,7 @@ Public Class OperationsListExpanderVM
          selOperation.m_Type = MCH_OY.DISP Then Return
       ' Tolgo Mark da lavorazione originale
       EgtResetMark(EgtGetFirstNameInGroup(selOperation.Id, MCH_MGR_CL))
+      EgtResetMark(EgtGetFirstNameInGroup(selOperation.Id, MCH_MGR_DBL))
       EgtSetStatus(EgtGetFirstNameInGroup(selOperation.Id, MCH_MGR_AUXVIEW), GDB_ST.OFF)
       SelData.ClearIdSub()
       ' Eseguo la copia
@@ -970,8 +971,8 @@ Public Class OperationsListExpanderVM
       Map.refProjectVM.SceneSelMode = SceneSelModeOpt.ALL
       OnPropertyChanged("ListIsExpanded")
       Map.refMachinePanelVM.ToolMachSetUpIsEnabled(True, True, True)
-      Map.refDoorPanelVM.MTableIsEnabled(True)
+      If Not IsNothing(Map.refDoorPanelVM) Then Map.refDoorPanelVM.MTableIsEnabled(True)
-      Map.refSpecialPanelVM.SpecialPanelIsEnabled(True)
+      If Not IsNothing(Map.refSpecialPanelVM) Then Map.refSpecialPanelVM.SpecialPanelIsEnabled(True)
       Return True
    End Function
 
@@ -1187,15 +1188,15 @@ Public Class OperationsListExpanderVM
       Next
    End Sub
 
-   Friend Function IsInOperationList(nId As Integer) As Boolean
+   Friend Function GetOperationId(nId As Integer) As Integer
-      Dim nOpId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nId)))
+      Dim nOpeId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nId)))
       For Index = 0 To OperationList.Count - 1
-         Dim nOpType As Integer = EgtGetOperationType(nOpId)
+         Dim nOpeType As Integer = EgtGetOperationType(nOpeId)
-         If OperationList(Index).Id = nOpId And nOpType <> MCH_OY.NONE And nOpType <> MCH_OY.DISP Then
+         If OperationList(Index).Id = nOpeId And nOpeType <> MCH_OY.NONE And nOpeType <> MCH_OY.DISP Then
-            Return True
+            Return nOpeId
          End If
       Next
-      Return False
+      Return GDB_ID.NULL
    End Function
 
    Friend Sub DeselOperationFromId()

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb

@@ -176,7 +176,9 @@ Public Class SimulationExpanderVM
       Return True
    End Function
 
-   Private Function UpdateAllMachinings() As Boolean
+   Friend Function UpdateAllMachinings() As Boolean
+      ' Se disabilitato, esco
+      If GetPrivateProfileInt( S_MACH, K_AUTOUPDATEALLMACHININGS, 1) = 0 Then Return True   
       ' Eseguo ricalcolo
       Dim bModified As Boolean = EgtGetModified()
       Dim sErr As String = String.Empty
@@ -252,6 +254,7 @@ Public Class SimulationExpanderVM
          Else
             MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), 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

OptionPanel/OptionPanelV.xaml

@@ -1,13 +1,14 @@
-<UserControl x:Class="OptionPanelV"
+<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:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+                              TitleBarOrientation="Vertical"
+                              Visibility="{Binding Panel_Visibility}">
 
-    <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+    <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
 
         <!--ContentPresenter that contains the ModePanel-->
         <ContentPresenter Content="{Binding ModePanel}"/>
     </StackPanel>
 
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

OptionPanel/OptionPanelV.xaml.vb

@@ -1,7 +1,3 @@
 Public Class OptionPanelV
 
-   Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
-      Dim x = ciao.MaxHeight
-   End Sub
-
 End Class

OptionPanel/OptionPanelVM.vb

@@ -1,20 +1,12 @@
 Imports EgtUILib
 
 Public Class OptionPanelVM
-   Inherits ViewModelBase
+   Inherits BasePanelVM
 
    Private m_DrawIsChecked As Boolean = True
 
    Private m_MachiningIsChecked As Boolean = False
 
-   Sub New()
-      Map.SetRefOptionPanelVM(Me)
-
-      DrawOptPanelV = New DrawOptionPanelV
-      MachOptPanelV = New MachiningOptionPanelV
-
-   End Sub
-
    Dim DrawOptPanelV As DrawOptionPanelV
    Dim MachOptPanelV As MachiningOptionPanelV
 
@@ -23,31 +15,43 @@ Public Class OptionPanelVM
 
    Public ReadOnly Property ModePanel As ContentControl
       Get
-
-         DrawOptPanelV.DataContext = Nothing
-         MachOptPanelV.DataContext = Nothing
-
          If Not IsNothing(Map.refDrawOptionPanelVM) And Not IsNothing(Map.refMachiningOptionPanelVM) Then
 
             If m_DrawIsChecked And Not m_MachiningIsChecked Then
                Map.refMachiningOptionPanelVM.ExitMachiningOptionPanel()
                Map.refDrawOptionPanelVM.InitDrawOptionPanel()
+               If DrawOptPanelV.DataContext IsNot Map.refDrawOptionPanelVM Then
                   DrawOptPanelV.DataContext = Map.refDrawOptionPanelVM
+               End If
                Return DrawOptPanelV
             End If
             If m_MachiningIsChecked And Not m_DrawIsChecked Then
                Map.refDrawOptionPanelVM.ExitDrawOptionPanel()
                Map.refMachiningOptionPanelVM.InitMachiningOptionPanel()
+               If MachOptPanelV.DataContext IsNot Map.refMachiningOptionPanelVM Then
                   MachOptPanelV.DataContext = Map.refMachiningOptionPanelVM
+               End If
                Return MachOptPanelV
             End If
-
          End If
 
+         DrawOptPanelV.DataContext = Nothing
+         MachOptPanelV.DataContext = Nothing
+
          Return Nothing
       End Get
    End Property
 
+   Sub New()
+      Map.SetRefOptionPanelVM(Me)
+
+      SetPanelViewState(ViewPanelStates.ALWAYS)
+
+      DrawOptPanelV = New DrawOptionPanelV
+      MachOptPanelV = New MachiningOptionPanelV
+
+   End Sub
+
    Friend Sub DrawMode_IsChecked()
       m_DrawIsChecked = True
       m_MachiningIsChecked = False
@@ -56,14 +60,14 @@ Public Class OptionPanelVM
          Map.refSimulationExpanderVM.Simulation_IsExpanded = False
          Map.refEstimationsExpanderVM.Estimation_IsExpanded = False
       End If
-      OnPropertyChanged("ModePanel")
+      NotifyPropertyChanged("ModePanel")
    End Sub
 
    Friend Sub MachiningMode_IsChecked()
       m_DrawIsChecked = False
       m_MachiningIsChecked = True
       EgtZoom(ZM.ALL, False)
-      OnPropertyChanged("ModePanel")
+      NotifyPropertyChanged("ModePanel")
    End Sub
 
 End Class

OptionsWindow/OptionWindowVM.vb

@@ -386,7 +386,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())
@@ -1090,7 +1090,7 @@ Public Class OptionWindowVM
       }
       If MachDlg.ShowDialog() <> True Then Return
       Dim sMachZip As String = MachDlg.FileName
-      Dim sMachName As String = Path.GetFileNameWithoutExtension(sMachZip)
+      Dim sMachName As String = Path.GetFileNameWithoutExtension(Path.GetFileNameWithoutExtension(sMachZip))
       Dim sMachDir As String = Path.Combine(IniFile.m_sMachinesRoot, sMachName)
       ' Preparo direttorio temporaneo
       Dim sTempDir As String = Path.Combine(IniFile.m_sMachinesRoot, "Temp")
@@ -1265,6 +1265,8 @@ Public Class OptionWindowVM
       End If
       Try
          Using zip As New Ionic.Zip.ZipFile(sZipToCreate)
+            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
+            zip.AlternateEncoding = Text.Encoding.UTF8
             ' aggiungo i file della Macchina
             Dim sMachineDir As String = IniFile.m_sMachinesRoot & "\" & sCurrMachineName
             If Directory.Exists(sMachineDir) Then

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

@@ -1,10 +1,21 @@
-<UserControl x:Class="ProjectV"
+<ItemsControl x:Class="ProjectV"
               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:local="clr-namespace:EgtCAM5"
               xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+              xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+              ItemsSource="{Binding PanelList}">
+   <ItemsControl.ItemsPanel>
+      <ItemsPanelTemplate>
+         <DockPanel />
+      </ItemsPanelTemplate>
+   </ItemsControl.ItemsPanel>
+   <ItemsControl.ItemContainerStyle>
+      <Style>
+         <Setter Property="DockPanel.Dock" Value="{Binding}" />
+      </Style>
+   </ItemsControl.ItemContainerStyle>
    
    <interactivity:Interaction.Triggers>
       <interactivity:EventTrigger EventName="Loaded">
@@ -12,97 +23,4 @@
       </interactivity:EventTrigger>
    </interactivity:Interaction.Triggers>
 
-   <EgtFloating:EgtFloatingManager>
+</ItemsControl>
-      <EgtFloating:EgtFloatingTray x:Name="TOPTRAY" DockPanel.Dock="Top">
-         <WrapPanel Orientation="Horizontal" Width="{Binding ActualWidth, ElementName=TOPTRAY}">
-            <EgtFloating:EgtFloatingPanel Name="ShowPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:ShowPanelV DataContext="{StaticResource ShowPanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="ViewPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:ViewPanelV DataContext="{StaticResource ViewPanelViewModel}"/>
-               <local:PopUpViewPanelV DataContext="{StaticResource PopUpViewPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
-            </EgtFloating:EgtFloatingPanel>
-            <!--<EgtFloating:EgtFloatingPanel Name="InstrumentPanel"
-                IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">-->
-            <local:InstrumentPanelV DataContext="{StaticResource InstrumentPanelViewModel}"/>
-            <!--</EgtFloating:EgtFloatingPanel>-->
-            <EgtFloating:EgtFloatingPanel Name="GridPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:GridPanelV DataContext="{StaticResource GridPanelViewModel}"/>
-               <local:PopUpGridPanelV DataContext="{StaticResource PopUpGridPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="DbPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:MachinePanelV DataContext="{StaticResource DbPanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="ExecutePanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:ExecutePanelV DataContext="{StaticResource ExecutePanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="SpecialPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:SpecialPanelV DataContext="{StaticResource SpecialPanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="BeamPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:BeamPanelV DataContext="{StaticResource BeamPanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="WallPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:WallPanelV DataContext="{StaticResource WallPanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="BeamWallPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:BeamWallPanelV DataContext="{StaticResource BeamWallPanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="DoorsPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:DoorPanelV DataContext="{StaticResource DoorsPanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="GunStockPanel"
-             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-               <local:GunStockPanelV DataContext="{StaticResource GunStockPanelViewModel}"/>
-            </EgtFloating:EgtFloatingPanel>
-            <EgtFloating:EgtFloatingPanel Name="PrintingPanel"
-                                          IsTopDockable="True" 
-                                          IsBottomDockable="True" 
-                                          IsLeftDockable="False" 
-                                          IsRightDockable="False">
-               <local:Printing3DPanelV DataContext="{StaticResource Printing3DPanelVM}"/>
-            </EgtFloating:EgtFloatingPanel>
-         </WrapPanel>
-      </EgtFloating:EgtFloatingTray>
-      <EgtFloating:EgtFloatingTray x:Name="LEFTTRAY" DockPanel.Dock="Left">
-         <EgtFloating:EgtFloatingPanel Name="DrawPanel" TitleBarOrientation="Vertical"
-            IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
-            <local:DrawPanelV DataContext="{StaticResource DrawPanelViewModel}"/>
-         </EgtFloating:EgtFloatingPanel>
-      </EgtFloating:EgtFloatingTray>
-      <EgtFloating:EgtFloatingTray x:Name="RIGHTTRAY" DockPanel.Dock="Right">
-         <EgtFloating:EgtFloatingPanel Name="OptionPanel" TitleBarOrientation="Vertical"
-            IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
-            <local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
-         </EgtFloating:EgtFloatingPanel>
-      </EgtFloating:EgtFloatingTray>
-      <!--<EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom">
-         <EgtFloating:EgtFloatingPanel Name="MachGroupPanel"
-            IsToolBar="False"
-            IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
-            <local:MachGroupPanelV DataContext="{StaticResource MachGroupPanelViewModel}"/>
-         </EgtFloating:EgtFloatingPanel>
-      </EgtFloating:EgtFloatingTray>-->
-      <EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom">
-         <EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelViewModel}"
-                                   RepaetButtonStyle="{StaticResource CustomScrollBarButton}"
-                                   MachGroupButtonStyle="{StaticResource {x:Type ToggleButton}}"
-                                   IsToolBar="False"
-                                   IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False"
-                                   IsRightDockable="False" />
-      </EgtFloating:EgtFloatingTray>
-      <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
-      <ContentControl Content="{Binding ProjectSceneHost}"/>
-   </EgtFloating:EgtFloatingManager>
-
-</UserControl>

Project/ProjectV.xaml.vb

@@ -7,18 +7,17 @@ Public Class ProjectV
    Private m_bWall As Boolean = False
    Private m_bDoors As Boolean = False
    Private m_bGunStock As Boolean = False
-   Private m_bPrinting3d As Boolean = False
 
    Private Sub UserControl_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo riferimento a questa classe in Map
       Map.SetRefProjectV(Me)
-      SpecialPanel.Visibility = Visibility.Collapsed
+      'SpecialPanel.Visibility = Visibility.Collapsed
-      BeamPanel.Visibility = Visibility.Collapsed
+      'BeamPanel.Visibility = Visibility.Collapsed
-      WallPanel.Visibility = Visibility.Collapsed
+      'WallPanel.Visibility = Visibility.Collapsed
-      DoorsPanel.Visibility = Visibility.Collapsed
+      'DoorsPanel.Visibility = Visibility.Collapsed
-      GunStockPanel.Visibility = Visibility.Collapsed
+      'GunStockPanel.Visibility = Visibility.Collapsed
-      PrintingPanel.Visibility = Visibility.Collapsed
+      'PrintingPanel.Visibility = Visibility.Collapsed
-      Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
+      ' Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
    End Sub
 
    Private Sub UserControl_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -48,7 +47,6 @@ Public Class ProjectV
       m_bWall = IniFile.IsActiveWall()
       m_bDoors = IniFile.IsActiveDoors()
       m_bGunStock = IniFile.IsActiveGunStock()
-      m_bPrinting3d = IniFile.IsActivePrinting3d()
    End Sub
 
    Private Sub PanelPositioning(FloatingPanel As EgtFloatingPanel, sState As String, nIndex As Integer, nLeft As Integer, nTop As Integer)
@@ -67,47 +65,47 @@ Public Class ProjectV
    End Sub
 
    Friend Sub SetDbPanelVisibility()
-      DbPanel.Visibility = If(IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW, Visibility.Collapsed, Visibility.Visible)
+      'DbPanel.Visibility = If(IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW, Visibility.Collapsed, Visibility.Visible)
    End Sub
 
    Friend Sub MachiningMode_IsChecked()
-      'ShowPanel.Visibility = Visibility.Visible
+      ''ShowPanel.Visibility = Visibility.Visible
-      ViewPanel.Visibility = Visibility.Visible
+      'ViewPanel.Visibility = Visibility.Visible
-      'InstrumentPanel.Visibility = Visibility.Visible
+      ''InstrumentPanel.Visibility = Visibility.Visible
-      GridPanel.Visibility = Visibility.Visible
+      'GridPanel.Visibility = Visibility.Visible
-      DbPanel.Visibility = Visibility.Visible
+      'DbPanel.Visibility = Visibility.Visible
-      ExecutePanel.Visibility = Visibility.Collapsed
+      'ExecutePanel.Visibility = Visibility.Collapsed
-      SpecialPanel.Visibility = If(m_bSpecial And Map.refSpecialPanelVM.SetSpecialPanelButtonsVisibility(True), Visibility.Visible, Visibility.Collapsed)
+      'SpecialPanel.Visibility = If(m_bSpecial And Map.refSpecialPanelVM.SetSpecialPanelButtonsVisibility(True), Visibility.Visible, Visibility.Collapsed)
-      BeamPanel.Visibility = Visibility.Collapsed
+      'BeamPanel.Visibility = Visibility.Collapsed
-      WallPanel.Visibility = Visibility.Collapsed
+      'WallPanel.Visibility = Visibility.Collapsed
-      BeamWallPanel.Visibility = Visibility.Collapsed
+      'BeamWallPanel.Visibility = Visibility.Collapsed
-      DoorsPanel.Visibility = If(m_bDoors, Visibility.Visible, Visibility.Collapsed)
+      'DoorsPanel.Visibility = If(m_bDoors, Visibility.Visible, Visibility.Collapsed)
-      PrintingPanel.Visibility = Visibility.Collapsed
+      'PrintingPanel.Visibility = Visibility.Collapsed
-      GunStockPanel.Visibility = Visibility.Collapsed
+      'GunStockPanel.Visibility = Visibility.Collapsed
-      DrawPanel.Visibility = Visibility.Collapsed
+      'DrawPanel.Visibility = Visibility.Collapsed
-      OptionPanel.Visibility = Visibility.Visible
+      'OptionPanel.Visibility = Visibility.Visible
       Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(IniFile.m_bMachiningGroup) ' MachGroupPanel.Visibility = If(IniFile.m_bMachiningGroup, Visibility.Visible, Visibility.Collapsed)
       If m_bDoors Then Map.refDoorPanelVM.SetDoorPanelButtonsVisibility(False)
    End Sub
 
    Friend Sub DrawMode_IsChecked()
-      'ShowPanel.Visibility = Visibility.Visible
+      ''ShowPanel.Visibility = Visibility.Visible
-      ViewPanel.Visibility = Visibility.Visible
+      'ViewPanel.Visibility = Visibility.Visible
-      'InstrumentPanel.Visibility = Visibility.Visible
+      ''InstrumentPanel.Visibility = Visibility.Visible
-      GridPanel.Visibility = Visibility.Visible
+      'GridPanel.Visibility = Visibility.Visible
-      DbPanel.Visibility = If(IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW, Visibility.Collapsed, Visibility.Visible)
+      'DbPanel.Visibility = If(IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW, Visibility.Collapsed, Visibility.Visible)
-      ExecutePanel.Visibility = Visibility.Visible
+      'ExecutePanel.Visibility = Visibility.Visible
-      SpecialPanel.Visibility = If(m_bSpecial And Map.refSpecialPanelVM.SetSpecialPanelButtonsVisibility(False), Visibility.Visible, Visibility.Collapsed)
+      'SpecialPanel.Visibility = If(m_bSpecial And Map.refSpecialPanelVM.SetSpecialPanelButtonsVisibility(False), Visibility.Visible, Visibility.Collapsed)
-      BeamPanel.Visibility = If(m_bBeam, Visibility.Visible, Visibility.Collapsed)
+      'BeamPanel.Visibility = If(m_bBeam, Visibility.Visible, Visibility.Collapsed)
-      WallPanel.Visibility = If(m_bWall, Visibility.Visible, Visibility.Collapsed)
+      'WallPanel.Visibility = If(m_bWall, Visibility.Visible, Visibility.Collapsed)
-      BeamWallPanel.Visibility = If(m_bBeam Or m_bWall, Visibility.Visible, Visibility.Collapsed)
+      'BeamWallPanel.Visibility = If(m_bBeam Or m_bWall, Visibility.Visible, Visibility.Collapsed)
-      DoorsPanel.Visibility = If(m_bDoors, Visibility.Visible, Visibility.Collapsed)
+      'DoorsPanel.Visibility = If(m_bDoors, Visibility.Visible, Visibility.Collapsed)
-      PrintingPanel.Visibility = If(m_bPrinting3d, Visibility.Visible, Visibility.Collapsed)
+      'PrintingPanel.Visibility = If(m_bPrinting3d, Visibility.Visible, Visibility.Collapsed)
-      GunStockPanel.Visibility = If(m_bGunStock, Visibility.Visible, Visibility.Collapsed)
+      'GunStockPanel.Visibility = If(m_bGunStock, Visibility.Visible, Visibility.Collapsed)
-      DrawPanel.Visibility = Visibility.Visible
+      'DrawPanel.Visibility = Visibility.Visible
-      OptionPanel.Visibility = Visibility.Visible
+      'OptionPanel.Visibility = Visibility.Visible
-      Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
+      '      Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
-      If m_bDoors Then Map.refDoorPanelVM.SetDoorPanelButtonsVisibility(True)
+      '     If m_bDoors Then Map.refDoorPanelVM.SetDoorPanelButtonsVisibility(True)
    End Sub
 
    Private Sub UserControl_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded

Project/ProjectVM.vb

@@ -51,17 +51,22 @@ Public Class ProjectVM
    ' Flag per non salvare Script appena eseguito in elenco MruScript
    Private m_bScriptInMru As Boolean = True
 
+   Private m_PanelList As New List(Of Panel)
+   Public ReadOnly Property PanelList As List(Of Panel)
+      Get
+         Return m_PanelList
+      End Get
+   End Property
+
 #End Region
 
 #Region "EGTUILIB FIELDS"
 
     Private m_bCPlaneTypePos As Boolean
-    'Private m_bStopExec As Boolean = False
-    'Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
-    'Private m_OutTextCallback As New OutTextCallback(AddressOf OutText)
 
    ' Variabile per implementazione eventi
    Private m_InputText As String
+
 #End Region
 
 #Region "CONSTRUCTOR"
@@ -74,6 +79,56 @@ Public Class ProjectVM
       TMDbParamVisibility.bFirst = True
       ' Inizializza i parametri della scena
       'InitializeEgtProject()
+      ' aggiungo componenti interfaccia
+      Dim bPlugin As Boolean = False
+      Dim PluginDirNameList() As String = {}
+      If IsActivePlugin() Then
+         Dim sPluginDirPath As String = IniFile.m_sDataRoot & "\Plugin"
+         If Directory.Exists(sPluginDirPath) Then
+            ' recupero nome del plugin
+            PluginDirNameList = Directory.GetDirectories(IniFile.m_sDataRoot & "\Plugin")
+            ' verifico che il nome delle cartelle corrisponda al nome delle dll
+            For PluginDirIndex As Integer = 0 To PluginDirNameList.Count - 1
+               Dim sPluginDirName As String = Path.GetFileName(PluginDirNameList(PluginDirIndex))
+               Dim sPluginFileNameList() As String = Directory.GetFiles(PluginDirNameList(PluginDirIndex))
+               If sPluginFileNameList.Count = 0 OrElse Not sPluginFileNameList.Any(Function(x) Path.GetFileNameWithoutExtension(x) = sPluginDirName) Then
+                  PluginDirNameList(PluginDirIndex) = ""
+               End If
+            Next
+            bPlugin = PluginDirNameList.Count(Function(x) Not String.IsNullOrWhiteSpace(x)) > 0
+         End If
+      End If
+      If bPlugin Then
+         For Each PluginDirName In PluginDirNameList
+            If Not String.IsNullOrWhiteSpace(PluginDirName) Then
+               Dim PluginName As String = Path.GetFileName(PluginDirName)
+               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
+                     Select Case Element.Name
+                        Case PLUGIN_RIGHT_TRAY
+                           m_PanelList.Add(New RightTrayV)
+                           Map.refOptionPanelVM.SetPanelViewState(Element.ViewPanelState)
+                        Case PLUGIN_LEFT_TRAY
+                           m_PanelList.Add(New LeftTrayV)
+                        Case Else
+                           m_PanelList.Add(Map.refMainWindowVM.GetControlByName(Of IPluginControl)(Element))
+                     End Select
+                  Next
+               End If
+            End If
+         Next
+         m_PanelList.Add(New BottomTrayV)
+         m_PanelList.Add(New TopTrayV)
+         ' nascondo tasti gestione progetto se attivo plugin
+         Map.refTopCommandBarVM.SetProjectManagerVisibility(False)
+      Else
+         m_PanelList.Add(New TopTrayV)
+         m_PanelList.Add(New LeftTrayV)
+         m_PanelList.Add(New RightTrayV)
+         m_PanelList.Add(New BottomTrayV)
+      End If
+      m_PanelList.Add(New SceneContentControlV)
    End Sub
 
 #End Region
@@ -129,42 +184,42 @@ Public Class ProjectVM
             Map.refProjectV.SetDbPanelVisibility()
          End If
          ' Inizializzo gestore travi e pareti
-         If ( IniFile.m_nKeyOptions And KEY_OPT.BEAM) <> 0  Or  ( IniFile.m_nKeyOptions And KEY_OPT.WALL) <> 0 Then
+         If (IniFile.m_nKeyOptions And KEY_OPT.BEAM) <> 0 Or (IniFile.m_nKeyOptions And KEY_OPT.WALL) <> 0 Then
-            Dim nFlag As Integer = GetPrivateProfileInt( S_IMPORT, K_BTLFLAG, EIB_FL.NONE)
+            Dim nFlag As Integer = GetPrivateProfileInt(S_IMPORT, K_BTLFLAG, EIB_FL.NONE)
-            EgtInitBeamMgr( nFlag)
+            EgtInitBeamMgr(nFlag)
          End If
          ' Log di eventuali estensioni
-         EgtOutLog( "Extensions :")
+         EgtOutLog("Extensions :")
          Dim bExtensions As Boolean = False
          If IniFile.IsActiveBeam() Then
             bExtensions = True
             Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion( IniFile.m_sBeamDirPath, sVersion)
+            IniFile.GetSpecialLuaVersion(IniFile.m_sBeamDirPath, sVersion)
             Dim sOut As String = "Beam ver. " & sVersion & "   " & IniFile.m_sBeamDirPath
-            EgtOutLog( sOut)
+            EgtOutLog(sOut)
          End If
          If IniFile.IsActiveWall() Then
             bExtensions = True
             Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion( IniFile.m_sWallDirPath, sVersion) 
+            IniFile.GetSpecialLuaVersion(IniFile.m_sWallDirPath, sVersion)
             Dim sOut As String = "Wall ver. " & sVersion & "   " & IniFile.m_sWallDirPath
-            EgtOutLog( sOut)
+            EgtOutLog(sOut)
          End If
          If IniFile.IsActiveDoors() Then
             bExtensions = True
             Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion( IniFile.m_sDoorsDirPath, sVersion) 
+            IniFile.GetSpecialLuaVersion(IniFile.m_sDoorsDirPath, sVersion)
             Dim sOut As String = "Doors ver. " & sVersion & "   " & IniFile.m_sDoorsDirPath
-            EgtOutLog( sOut)
+            EgtOutLog(sOut)
          End If
          If IniFile.IsActiveGunStock() Then
             bExtensions = True
             Dim sVersion As String = "---"
-            IniFile.GetSpecialLuaVersion( IniFile.m_sGunstockDirPath, sVersion) 
+            IniFile.GetSpecialLuaVersion(IniFile.m_sGunstockDirPath, sVersion)
             Dim sOut As String = "Gunstock ver. " & sVersion & "   " & IniFile.m_sGunstockDirPath
-            EgtOutLog( sOut)
+            EgtOutLog(sOut)
          End If
-         If Not bExtensions Then EgtOutLog( "---")
+         If Not bExtensions Then EgtOutLog("---")
          ' Apro progetto vuoto
          Map.refTopCommandBarVM.NewCmd()
          ' Seleziono la macchina impostata nel file ini
@@ -176,18 +231,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 {
@@ -323,9 +393,9 @@ Public Class ProjectVM
       ' lettura flag visualizzazione solo tavola in definizione lavorazioni
       IniFile.m_bShowOnlyTable = (GetPrivateProfileInt(S_MACH, K_SHOWONLYTABLE, 1) <> 0)
       ' ObjTree non selezionato
-      Map.refManageLayerExpanderVM.UpdateObjTreeOldId(GDB_ID.NULL)
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.UpdateObjTreeOldId(GDB_ID.NULL)
       ' nascondo input box
-      Map.refInputExpanderVM.ResetInputBox()
+      If Not IsNothing(Map.refInputExpanderVM) Then Map.refInputExpanderVM.ResetInputBox()
       ' Imposto stato filtro selezione
       m_ProjectScene.GetObjFilterForSel(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
       m_Controller.MouseSetObjFilterForSelect(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
@@ -412,7 +482,7 @@ Public Class ProjectVM
                Return
             End If
             ' Esecuzione
-            bOk = ExecBeam(sFile, sMachine, nFlag, true)
+            bOk = ExecBeam(sFile, sMachine, nFlag, True)
             ' altrimenti pareti
          Else
             ' Verifica abilitazione elaborazione pareti
@@ -421,7 +491,7 @@ Public Class ProjectVM
                Return
             End If
             ' Esecuzione
-            bOk = ExecWall(sFile, sMachine, nFlag, true)
+            bOk = ExecWall(sFile, sMachine, nFlag, True)
          End If
          ' Se richiesta uscita immediata
          If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Then
@@ -503,7 +573,7 @@ Public Class ProjectVM
                Return
             End If
             ' Esecuzione
-            bOk = ExecBeam(sFile, sMachine, nFlag, false)
+            bOk = ExecBeam(sFile, sMachine, nFlag, False)
             ' altrimenti pareti
          ElseIf nBWType = 2 Then
             ' Verifica abilitazione elaborazione pareti
@@ -512,7 +582,7 @@ Public Class ProjectVM
                Return
             End If
             ' Esecuzione
-            bOk = ExecWall(sFile, sMachine, nFlag, false)
+            bOk = ExecWall(sFile, sMachine, nFlag, False)
          End If
          ' Se richiesta uscita immediata
          If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Then
@@ -534,7 +604,7 @@ Public Class ProjectVM
       Select Case nFileType
          Case FT.NGE, FT.NFE
             Return m_Controller.OpenProject(sFile, False)
-         Case FT.DXF, FT.STL, FT._3MF, FT.OBJ, FT.CNC, FT.CSF, FT.BTL, FT.BTLX, FT.IMG, FT.PNT, FT.IGES, FT.STEP_, FT.ACIS, FT.PARASOLID, FT.JT, FT.VRML, FT.C3D
+         Case FT.DXF, FT.STL, FT._3MF, FT._3DM, FT.OBJ, FT.CNC, FT.CSF, FT.BTL, FT.BTLX, FT.IMG, FT.PNT, FT.IGES, FT.STEP_, FT.ACIS, FT.PARASOLID, FT.JT, FT.VRML, FT.C3D
             Return m_Controller.ImportProject(sFile, False)
          Case FT.TSC, FT.LUA
             Return m_Controller.Exec(sFile, False)
@@ -660,7 +730,7 @@ Public Class ProjectVM
    Friend Sub InsertProject()
       ' eseguo
       Dim sDir As String = String.Empty
-      GetPrivateProfileString(S_GENERAL, K_LASTNGEDIR, "", sDir)
+      GetPrivateProfileString(S_GENERAL, K_LASTNGEINSDIR, "", sDir)
       m_Controller.InsertProject(sDir)
    End Sub
 
@@ -685,7 +755,7 @@ Public Class ProjectVM
          GetPrivateProfileString(S_GENERAL, K_LASTLUADIR, "", sDir)
          m_Controller.Exec(sDir)
       Else
-         If bRaiseEvent Then RaiseEvent OnPreControllerExec( sFilePath)
+         If bRaiseEvent Then RaiseEvent OnPreControllerExec(sFilePath)
          m_Controller.Exec(sFilePath, False)
          If bRaiseEvent Then RaiseEvent OnPostControllerExec()
       End If
@@ -809,7 +879,7 @@ Public Class ProjectVM
          ' Copia dei file terminata con successo ...
          Dim sMsg As String = EgtMsg(8216) & vbCrLf & sFilePath & vbCrLf & "->" & sDirDest
          MessageBox.Show(sMsg, EgtMsg(8214), MessageBoxButton.OK, MessageBoxImage.Information)
-      else
+      Else
          ' Errore nella copia dei file ...
          Dim sMsg As String = EgtMsg(8255) & vbCrLf & sFilePath & vbCrLf & "->" & sDirDest
          MessageBox.Show(sMsg, EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -995,7 +1065,7 @@ Public Class ProjectVM
    Private m_nIdToSel As Integer = GDB_ID.NULL
    Private m_SelType As DispositionUtility.SelType = DispositionUtility.SelType.NULL
    Private m_nIdToDesel As Integer = GDB_ID.NULL
-   'Private m_nFirstRawPartId As Integer = GDB_ID.NULL
+   Private m_nSelOpeId As Integer = GDB_ID.NULL
 
    ' Dati per Drag
    Private m_nRestRadius As Integer = 3
@@ -1005,14 +1075,18 @@ Public Class ProjectVM
    Private m_locPrev As System.Drawing.Point
    Private m_ptPrev As Point3d
 
-   Private Sub OnMouseDown(ByVal sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_ProjectScene.OnMouseDownScene
+   Private Sub OnStartingMouseDown(ByVal sender As Object, e As System.Windows.Forms.MouseEventArgs, ByRef bContinue As Boolean) Handles m_ProjectScene.OnStartingMouseDownScene
       ' Se in modalità Draw accetto tutto
       If IniFile.m_ProjectMode = ProjectModeOpt.DRAW OrElse IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW Then Return
       ' Sono in modalità Machining
       ' se non posso selezionare nulla o in lavorazione esco
-      If m_SceneSelType = SceneSelTypeOpt.NULL OrElse m_SceneSelType = SceneSelTypeOpt.MACHINING Then Return
+      If m_SceneSelType = SceneSelTypeOpt.NULL OrElse
+         m_SceneSelType = SceneSelTypeOpt.MACHINING OrElse
+         m_SceneSelType = SceneSelTypeOpt.MACHPATH Then Return
       ' Si può selezionare solo con il tasto sinistro
       If e.Button <> Forms.MouseButtons.Left Then Return
+      ' Si Sostituisce completamente la gestione dell'evento chiamante
+      bContinue = False
       ' Dati per drag
       Dim TableRef As Point3d
       EgtGetTableRef(1, TableRef)
@@ -1204,12 +1278,16 @@ Public Class ProjectVM
       EgtDraw()
    End Sub
 
+   Private Sub OnStartingMouseSelectingObj(ByVal sender As Object) Handles m_ProjectScene.OnStartingMouseSelectingObj
+      m_nSelOpeId = GDB_ID.NULL
+   End Sub
+
    Private Sub OnMouseSelectingObj(ByVal sender As Object, ByVal nId As Integer, ByRef bOk As Boolean) Handles m_ProjectScene.OnMouseSelectingObj
       ' Se oggetto già rifiutato non faccio le verifiche
       If Not bOk Then Return
       ' Impedisco la selezione di oggetti in modo Locked o Hidden
       Dim nMode As Integer = GDB_MD.STD
-      EgtGetCalcMode( nId, nMode) 
+      EgtGetCalcMode(nId, nMode)
       If nMode <> GDB_MD.STD Then
          bOk = False
          Return
@@ -1226,7 +1304,9 @@ Public Class ProjectVM
                bOk = False
             End If
          Case SceneSelTypeOpt.MACHPATH
-            bOk = Map.refOperationsListExpanderVM.IsInOperationList(nId)
+            Dim nCurrOpeId As Integer = Map.refOperationsListExpanderVM.GetOperationId(nId)
+            bOk = (nCurrOpeId <> GDB_ID.NULL AndAlso nCurrOpeId <> m_nSelOpeId)
+            If m_nSelOpeId = GDB_ID.NULL Then m_nSelOpeId = nCurrOpeId
          Case Else
             bOk = False
       End Select
@@ -1258,15 +1338,15 @@ Public Class ProjectVM
    Private Sub OnMousePointFromSelection(ByVal sender As Object, ByVal nId As Integer, ByVal PtP As Point3d, ByVal nAux As Integer) Handles m_ProjectScene.OnMousePointFromSelection
       m_Controller.SetPointFromSelection(nId, PtP, nAux)
       If IniFile.m_ProjectMode = ProjectModeOpt.MACHINING And m_SceneSelType = SceneSelTypeOpt.MACHINING And
-         ( EgtGetType( nId) = GDB_TY.SRF_MESH Or EgtGetType( nId) = GDB_TY.SRF_FRGN) Then
+         (EgtGetType(nId) = GDB_TY.SRF_MESH Or EgtGetType(nId) = GDB_TY.SRF_FRGN) Then
-         If EgtIsSelectedObj( nId) Then
+         If EgtIsSelectedObj(nId) Then
-            Dim nFac As Integer = If( EgtGetType( nId) = GDB_TY.SRF_MESH, Math.Max( EgtSurfTmFacetFromTria( nId, nAux), 0), nAux)
+            Dim nFac As Integer = If(EgtGetType(nId) = GDB_TY.SRF_MESH, Math.Max(EgtSurfTmFacetFromTria(nId, nAux), 0), nAux)
-            If Not SelData.FindIdSub( nId, nFac) Then
+            If Not SelData.FindIdSub(nId, nFac) Then
                SelData.AddIdSub(nId, nFac)
             Else
                SelData.RemoveIdSub(nId, nFac)
-               If Not SelData.FindId( nId) Then
+               If Not SelData.FindId(nId) Then
-                  EgtDeselectObj( nId)
+                  EgtDeselectObj(nId)
                End If
             End If
          Else
@@ -1300,29 +1380,29 @@ Public Class ProjectVM
       Analyze.ClearAnalyzeGroup()
       Map.refStatusBarVM.NotifyStatusOutput("")
       ' Se curva composita, visualizzo numerazione curve semplici
-      If EgtGetType( nId) = GDB_TY.CRV_COMPO Then
+      If EgtGetType(nId) = GDB_TY.CRV_COMPO Then
          ' Visualizzo numerazione
          Analyze.CreateAnalyzeGroup()
-         Analyze.CreateCurveCompoPntNbrs( nId)
+         Analyze.CreateCurveCompoPntNbrs(nId)
          ' Se superficie trimesh, visualizzo dati faccetta toccata
-      ElseIf EgtGetType( nId) = GDB_TY.SRF_MESH Then
+      ElseIf EgtGetType(nId) = GDB_TY.SRF_MESH Then
-         Dim nFac As Integer = EgtSurfTmFacetFromTria( nId, nSub)
+         Dim nFac As Integer = EgtSurfTmFacetFromTria(nId, nSub)
          If nFac <> -1 Then
             ' Visualizzo la normale e il contorno della faccia
             Analyze.CreateAnalyzeGroup()
-            Analyze.CreateNormal( nId, nFac)
+            Analyze.CreateNormal(nId, nFac)
-            Analyze.CreateFacetLoops( nId, nFac)
+            Analyze.CreateFacetLoops(nId, nFac)
             ' Recupero i dati (in globale o griglia a seconda della impostazione)
             Dim ptC As Point3d
             Dim vtN As Vector3d
-            EgtSurfTmFacetCenter( nId, nFac, If( m_bCPlaneTypePos, GDB_ID.GRID, GDB_ID.ROOT), ptC, vtN)
+            EgtSurfTmFacetCenter(nId, nFac, If(m_bCPlaneTypePos, GDB_ID.GRID, GDB_ID.ROOT), ptC, vtN)
             Dim dLen, dPhi, dTheta As Double
-            vtN.ToSpherical( dLen, dTheta, dPhi)
+            vtN.ToSpherical(dLen, dTheta, dPhi)
             ' Emetto info sulla barra di stato
             Dim sOut As String = "Facet " + nFac.ToString() +
-                                 " : C(" + LenToString( ptC.x, 3) + "," + LenToString( ptC.y, 3) + ","  + LenToString( ptC.z, 3) + ")" +
+                                 " : 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) + ")" +
+                                   " N(" + DoubleToString(vtN.x, 4) + "," + DoubleToString(vtN.y, 4) + "," + DoubleToString(vtN.z, 4) + ")" +
-                                 " / φ=" + DoubleToString( dPhi, 2) + " θ=" + DoubleToString( dTheta, 2)
+                                 " / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2)
             Map.refStatusBarVM.NotifyStatusOutput(sOut)
          End If
       End If
@@ -1341,7 +1421,7 @@ Public Class ProjectVM
          m_Controller.ExecuteCommand(Controller.CMD.DELETE)
          ' Con END eseguo deselezione di tutto
       ElseIf e.KeyData = System.Windows.Forms.Keys.End Then
-         m_Controller.MouseDeselectedAll( True)
+         m_Controller.MouseDeselectedAll(True)
          ' Con SPAZIO ripeto l'ultimo comando
       ElseIf e.KeyData = System.Windows.Forms.Keys.Space Then
          m_Controller.RepeatLastCommand()
@@ -1377,7 +1457,7 @@ Public Class ProjectVM
    End Sub
 
    Private Sub OnOpeningProject(ByVal sender As Object) Handles m_Controller.OnOpeningProject
-      Map.refManageLayerExpanderVM.ClearObjTree()
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.ClearObjTree()
    End Sub
 
    Private Sub OnOpenProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnOpenProject
@@ -1388,7 +1468,7 @@ Public Class ProjectVM
       Else
          IniFile.m_MruFiles.Remove(sFile)
          Dim sMsg As String
-         If My.Computer.FileSystem.FileExists( sFile) Then
+         If My.Computer.FileSystem.FileExists(sFile) Then
             sMsg = EgtMsg(10003) & " '" & sFile & "'"            'Error opening file
          Else
             sMsg = EgtMsg(10009) & " '" & sFile & "'"            'Missing file
@@ -1397,8 +1477,18 @@ 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))
    End Sub
 
    Private Sub OnSavingProject(ByVal sender As Object, ByVal sFile As String) Handles m_Controller.OnSavingProject
@@ -1436,6 +1526,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
@@ -1489,7 +1582,7 @@ Public Class ProjectVM
          End If
       Else
          If m_bScriptInMru Then
-            If File.Exists( sFile) Then
+            If File.Exists(sFile) Then
                IniFile.m_MruScripts.Add(sFile)
                WritePrivateProfileString(S_GENERAL, K_LASTLUADIR, Path.GetDirectoryName(sFile))
             Else
@@ -1524,7 +1617,7 @@ Public Class ProjectVM
 
    Private Sub OnUpdateUI(ByVal sender As Object, ByVal bReloadUI As Boolean) Handles m_Controller.UpdateUI
       ' pulisco input e relativi messaggi
-      Map.refInputExpanderVM.ResetInputBox()
+      If Not IsNothing(Map.refInputExpanderVM) Then Map.refInputExpanderVM.ResetInputBox()
       If m_Controller.GetContinue() Then
          Map.refStatusBarVM.NotifyStatusOutput((EgtMsg(399)))      ' Continue : 'L' with line, 'A' with arc
       Else
@@ -1534,9 +1627,9 @@ Public Class ProjectVM
       EmitTitle()
       EmitCurrPartLayer()
       If bReloadUI Then
-         Map.refManageLayerExpanderVM.LoadObjTree()
+         If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.LoadObjTree()
       Else
-         Map.refManageLayerExpanderVM.UpdateObjTree()
+         If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.UpdateObjTree()
       End If
       ' aggiorno macchina corrente
       Map.refMachinePanelVM.UpdateCurrentMachine()
@@ -1611,9 +1704,9 @@ Public Class ProjectVM
             EgtGetCalcColor(nCurrLayer, colObj)
          End If
       End If
-      Map.refManageLayerExpanderVM.UpdateHeaderName(sText)
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.UpdateHeaderName(sText)
       colObj.A = 100
-      Map.refManageLayerExpanderVM.UpdateHeaderColor(colObj)
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.UpdateHeaderColor(colObj)
    End Sub
 
 #End Region    'DrawOptionPanel

RightTray/RightTrayV.xaml

@@ -0,0 +1,7 @@
+<Grid x:Class="RightTrayV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:local="clr-namespace:EgtCAM5"
+      DockPanel.Dock="Right">
+   <local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
+</Grid>

RightTray/RightTrayV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class RightTrayV
+
+End Class

SceneContentControl/SceneContentControlV.xaml

@@ -0,0 +1,8 @@
+<Grid x:Class="SceneContentControlV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
+   <ContentControl Content="{Binding ProjectSceneHost}"/>
+   
+</Grid>

SceneContentControl/SceneContentControlV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class SceneContentControlV
+
+End Class

SetUp/SetUpVM.vb

@@ -409,7 +409,7 @@ Public Class SetUpVM
                               ' verifico se la testa è diversa
                               If TempPosition.Head <> sHead Then
                                  ' altrimenti la sovrascrivo
-                                 TempPosition.Head = sHead
+                                 TempPosition.SetHead( sHead)
                                  ' la metto anche come testa originale
                                  If bOriginal Then TempPosition.OrigHead = sHead
                                  ' e verifico il numero di uscite

Special-3dPrinting/Printing3DPanelV.xaml

@@ -1,20 +0,0 @@
-<UserControl x:Class="Printing3DPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <ItemsControl ItemsSource="{Binding ButtonList}">
-      <ItemsControl.ItemsPanel>
-         <ItemsPanelTemplate>
-            <StackPanel Orientation="Horizontal"/>
-         </ItemsPanelTemplate>
-      </ItemsControl.ItemsPanel>
-      <ItemsControl.ItemTemplate>
-         <DataTemplate>
-            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
-               <Image Source="{Binding ImagePath}"/>
-            </Button>
-         </DataTemplate>
-      </ItemsControl.ItemTemplate>
-   </ItemsControl>
-   
-</UserControl>

Special-3dPrinting/Printing3DPanelV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class Printing3DPanelV
-
-End Class

Special-3dPrinting/Printing3DPanelVM.vb

@@ -1,26 +0,0 @@
-Imports System.IO
-Imports EgtUILib
-
-Public Class Printing3DPanelVM
-
-   Private m_ButtonList As New List(Of ButtonItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonItem)
-      Get
-         Return m_ButtonList
-      End Get
-   End Property
-
-   Sub New()
-      ' Se attivo, inizializzo i bottoni leggendoli da file ini
-      If IniFile.IsActivePrinting3d() Then
-         ' Inizializzo i bottoni leggendoli da file ini
-         Dim BtnIndex As Integer = 1
-         Dim CurrBtn As ButtonItem = Nothing
-         While GetPrivateProfileButton(S_PRINTING3D, K_BUTTON & BtnIndex, IniFile.m_sPrinting3dDirPath, CurrBtn)
-            m_ButtonList.Add(CurrBtn)
-            BtnIndex += 1
-         End While
-      End If
-   End Sub
-
-End Class

Special-BeamWall/BeamPanelV.xaml

@@ -1,6 +1,8 @@
-<UserControl x:Class="BeamPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="BeamPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding BeamPanel_Visibility}">
 
    <ItemsControl ItemsSource="{Binding ButtonList}">
       <ItemsControl.ItemsPanel>
@@ -17,4 +19,4 @@
       </ItemsControl.ItemTemplate>
    </ItemsControl>
    
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

Special-BeamWall/BeamPanelVM.vb

@@ -2,6 +2,7 @@
 Imports EgtUILib
 
 Public Class BeamPanelVM
+   Inherits VMBase
 
    Friend Const BEAM_PROCESS As String = "Beam\Process.lua"
    Friend Const BEAM_MACHININGS As String = "BeamMachinings"
@@ -13,7 +14,20 @@ Public Class BeamPanelVM
       End Get
    End Property
 
+   Private m_BeamPanel_Visibility As Visibility
+   Public ReadOnly Property BeamPanel_Visibility As Visibility
+      Get
+         Return m_BeamPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetBeamPanelVisibility(bValue As Boolean)
+      m_BeamPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(BeamPanel_Visibility))
+   End Sub
+
    Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefBeamPanelVM(Me)
       ' Se attivo, inizializzo i bottoni leggendoli da file ini
       If IniFile.IsActiveBeam() Then
          ' Inizializzo i bottoni leggendoli da file ini

Special-BeamWall/BeamWallPanelV.xaml

@@ -1,6 +1,8 @@
-<UserControl x:Class="BeamWallPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="BeamWallPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding BeamWallPanel_Visibility}">
 
    <ItemsControl ItemsSource="{Binding ButtonList}">
       <ItemsControl.ItemsPanel>
@@ -17,4 +19,4 @@
       </ItemsControl.ItemTemplate>
    </ItemsControl>
    
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

Special-BeamWall/BeamWallPanelVM.vb

@@ -2,6 +2,7 @@
 Imports EgtUILib
 
 Public Class BeamWallPanelVM
+   Inherits VMBase
 
    Private m_ButtonList As New List(Of ButtonItem)
    Public ReadOnly Property ButtonList As List(Of ButtonItem)
@@ -10,14 +11,27 @@ Public Class BeamWallPanelVM
       End Get
    End Property
 
+   Private m_BeamWallPanel_Visibility As Visibility
+   Public ReadOnly Property BeamWallPanel_Visibility As Visibility
+      Get
+         Return m_BeamWallPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetBeamWallPanelVisibility(bValue As Boolean)
+      m_BeamWallPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(BeamWallPanel_Visibility))
+   End Sub
+
    Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefBeamWallPanelVM(Me)
       ' Se attivo Beam o Wall, inizializzo i bottoni leggendoli da file ini
       If IniFile.IsActiveBeam() Or IniFile.IsActiveWall() Then
-         GetPrivateProfileString( S_BEAMWALL, K_BEAMWALLBASEDIR, "", m_sBeamWallDirPath)
+         GetPrivateProfileString(S_BEAMWALL, K_BEAMWALLBASEDIR, "", m_sBeamWallDirPath)
          ' Inizializzo i bottoni leggendoli da file ini
          Dim BtnIndex As Integer = 1
          Dim CurrBtn As ButtonItem = Nothing
-         While GetPrivateProfileButton( S_BEAMWALL, K_BEAMWALLBUTTON & BtnIndex, IniFile.m_sBeamWallDirPath, CurrBtn)
+         While GetPrivateProfileButton(S_BEAMWALL, K_BEAMWALLBUTTON & BtnIndex, IniFile.m_sBeamWallDirPath, CurrBtn)
             m_ButtonList.Add(CurrBtn)
             BtnIndex += 1
          End While

Special-BeamWall/WallPanelV.xaml

@@ -1,6 +1,8 @@
-<UserControl x:Class="WallPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="WallPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding WallPanel_Visibility}">
 
    <ItemsControl ItemsSource="{Binding ButtonList}">
       <ItemsControl.ItemsPanel>
@@ -17,4 +19,4 @@
       </ItemsControl.ItemTemplate>
    </ItemsControl>
    
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

Special-BeamWall/WallPanelVM.vb

@@ -2,6 +2,7 @@
 Imports EgtUILib
 
 Public Class WallPanelVM
+   Inherits VMBase
 
    Friend Const WALL_MACHININGS As String = "WallMachinings"
 
@@ -12,7 +13,20 @@ Public Class WallPanelVM
       End Get
    End Property
 
+   Private m_WallPanel_Visibility As Visibility
+   Public ReadOnly Property WallPanel_Visibility As Visibility
+      Get
+         Return m_WallPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetWallPanelVisibility(bValue As Boolean)
+      m_WallPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(WallPanel_Visibility))
+   End Sub
+
    Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefWallPanelVM(Me)
       ' Se attivo, inizializzo i bottoni leggendoli da file ini
       If IniFile.IsActiveWall() Then
          ' Inizializzo i bottoni leggendoli da file ini

Special-Doors/DoorPanelV.xaml

@@ -1,6 +1,8 @@
-<UserControl x:Class="DoorPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="DoorPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding DoorPanel_Visibility}">
 
    <!--Barra superiore dei comandi-->
    <StackPanel Background="Transparent" Orientation="Horizontal">
@@ -18,4 +20,4 @@
               IsEnabled="{Binding MTableDb_IsEnabled}"/>
    </StackPanel>
 
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

Special-Doors/DoorPanelVM.vb

@@ -31,6 +31,17 @@ Public Class DoorPanelVM
       End Get
    End Property
 
+   Private m_DoorPanel_Visibility As Visibility
+   Public ReadOnly Property DoorPanel_Visibility As Visibility
+      Get
+         Return m_DoorPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetDoorPanelVisibility(bValue As Boolean)
+      m_DoorPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      OnPropertyChanged(NameOf(DoorPanel_Visibility))
+   End Sub
+
    ' Definizione comandi
    Private m_cmdDoors As ICommand
    Private m_cmdDMach As ICommand

Special-GunStock/GunStockPanelV.xaml

@@ -1,6 +1,8 @@
-<UserControl x:Class="GunStockPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="GunStockPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding GunStockPanel_Visibility}">
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button Command="{Binding NewGunStockCommand}" Style="{StaticResource GridViewPanelButton}"
@@ -27,4 +29,4 @@
       </Button>
    </StackPanel>
 
-</UserControl>
+</EgtFloating:EgtFloatingPanel>

Special-GunStock/GunStockPanelVM.vb

@@ -16,6 +16,25 @@ Public Class GunStockPanelVM
       End Get
    End Property
 
+   Public ReadOnly Property CopyGunStock_Visibility As Visibility
+      Get
+         Dim sFunction As String = String.Empty
+         GetPrivateProfileString(S_GUNSTOCK, K_COPYFUNCTION, "", sFunction)
+         Return If(String.IsNullOrWhiteSpace(sFunction), Visibility.Collapsed, Visibility.Visible)
+      End Get
+   End Property
+
+   Private m_GunStockPanel_Visibility As Visibility
+   Public ReadOnly Property GunStockPanel_Visibility As Visibility
+      Get
+         Return m_GunStockPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetGunStockPanelVisibility(bValue As Boolean)
+      m_GunStockPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      OnPropertyChanged(NameOf(GunStockPanel_Visibility))
+   End Sub
+
 #Region "Messages"
 
    Public ReadOnly Property NewGunStockMsg As String
@@ -56,13 +75,6 @@ Public Class GunStockPanelVM
 
 #End Region    ' ToolTip
 
-   Public ReadOnly Property CopyGunStock_Visibility As Visibility
-      Get
-         Dim sFunction As String = String.Empty
-         GetPrivateProfileString(S_GUNSTOCK, K_COPYFUNCTION, "", sFunction)
-         Return If( String.IsNullOrWhiteSpace( sFunction), Visibility.Collapsed, Visibility.Visible)
-      End Get
-   End Property
 
 
    ' Definizione comandi
@@ -72,6 +84,10 @@ Public Class GunStockPanelVM
    Private Shared m_cmdOpenMruNewGunStock As ICommand
    Private Shared m_cmdOpenMruModifyGunStock As ICommand
 
+   Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefGunStockPanelVM(Me)
+   End Sub
 #Region "COMMANDS"
 
 #Region "NewGunStockCommand"