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

Constants/ConstIni.vb

@@ -47,7 +47,6 @@ Module ConstIni
 
    Public Const S_LUA As String = "Lua"
    Public Const K_LIBSDIR As String = "LibsDir"
-   Public Const K_LIBSDIR64 As String = "LibsDir64"
    Public Const K_BASELIB As String = "BaseLib"
    Public Const K_BWSIM As String = "BWSim"
 
@@ -109,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"
@@ -123,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"
@@ -132,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"
@@ -172,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"

DrawPanel/DrawPanelV.xaml

@@ -74,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"
@@ -177,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}">
@@ -194,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}">

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)
@@ -455,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
@@ -466,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
@@ -476,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
@@ -714,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
@@ -737,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
 
@@ -872,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>
@@ -1195,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>
@@ -1438,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

@@ -1002,6 +1002,25 @@
   <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

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"
 

MachGroupPanel/MyMachGroupPanelVM.vb

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

MachOptionsWindow/MachOptionV.xaml

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

MachOptionsWindow/MachOptionVM.vb

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

MachinePanel/MyMachinePanelVM.vb

@@ -294,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/MainWindowVM.vb

@@ -357,9 +357,6 @@ Public Class MainWindowVM
       ' Impostazione direttorio toolmakers
       Dim sToolMakersDir As String = String.Empty
       GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR, "", sToolMakersDir)
-#If PLATFORM = "x64" Then
-         GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR64, sToolMakersDir, sToolMakersDir)
-#End If
       If Not String.IsNullOrWhiteSpace(sToolMakersDir) Then
          IniFile.m_sToolMakersDir = sToolMakersDir
       Else
@@ -388,8 +385,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2511, 1, IniFile.m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2605, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2511, 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
@@ -403,7 +400,7 @@ Public Class MainWindowVM
       IniFile.m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString())
       Dim sLogMsg As String = "User " & Environment.MachineName & "\" & Environment.UserName &
                               "  Inst" & IniFile.m_nInstance.ToString() &
-" Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" & DebugLevel().ToString() & vbLf &
+                              " 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)
@@ -436,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)

My Project/AssemblyInfo.vb

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

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

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())

PopUpGridPanel/PopUpGridPanelV.xaml

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

PopUpGridPanel/PopUpGridPanelViewModel.vb

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

PopUpViewPanel/PopUpViewPanelV.xaml

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

PopUpViewPanel/PopUpViewPanelVM.vb

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

Project/ProjectVM.vb

@@ -231,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 {
@@ -1462,6 +1477,15 @@ Public Class ProjectVM
       End If
    End Sub
 
+   Private Sub OnInsertingProject(ByVal sender As Object, nType As Integer, ByRef nFlag As Integer) Handles m_Controller.OnInsertingProject
+      If nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
+         nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then
+         nFlag = GetMainPrivateProfileInt(S_IMPORT, K_ADVFLAG, 0)
+      Else
+         nFlag = 0
+      End If
+   End Sub
+
    Private Sub OnInsertedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnInsertedProject
       EgtZoom(ZM.ALL)
       WritePrivateProfileString(S_GENERAL, K_LASTNGEINSDIR, Path.GetDirectoryName(sFile))
@@ -1502,6 +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

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

TopCommandBar/TopCommandBarVM.vb

@@ -653,7 +653,7 @@ Public Class TopCommandBarVM
       While nMchGrpId <> GDB_ID.NULL
          Dim sMachineName As String = String.Empty
          EgtGetMachGroupMachineName(nMchGrpId, sMachineName)
-         If Not String.IsNullOrWhiteSpace(sMachineName) Then
+         If Not String.IsNullOrWhiteSpace(sMachineName) AndAlso Not Machines.Contains( sMachineName) Then
             Machines.Add(sMachineName)
          End If
          nMchGrpId = EgtGetNextMachGroup(nMchGrpId)
@@ -839,7 +839,7 @@ Public Class TopCommandBarVM
       Map.refBeamPanelVM.SetBeamPanelVisibility(False)
       Map.refWallPanelVM.SetWallPanelVisibility(False)
       Map.refBeamWallPanelVM.SetBeamWallPanelVisibility(False)
-      Map.refDoorPanelVM.SetDoorPanelVisibility(False)
+      Map.refDoorPanelVM.SetDoorPanelVisibility(IniFile.IsActiveDoors())
       Map.refGunStockPanelVM.SetGunStockPanelVisibility(False)
       If Not IsNothing(Map.refDrawPanelVM) Then Map.refDrawPanelVM.SetDrawPanelVisibility(False)
       Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(IniFile.m_bMachiningGroup)

Utility/Dictionary.xaml

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

Utility/IniFile.vb

@@ -263,9 +263,6 @@ Public Module IniFile
       If bIsActive Then
           Dim sTemp As String = ""
           GetPrivateProfileString(S_BEAM, K_BEAMBASEDIR, "", sTemp)
-          #If PLATFORM = "x64" Then
-             GetPrivateProfileString(S_BEAM, K_BEAMBASEDIR64, sTemp, sTemp)
-          #End If
           m_sBeamDirPath = sTemp.TrimEnd( "\"c)
       End If
       Return bIsActive
@@ -276,9 +273,6 @@ Public Module IniFile
       If bIsActive Then
           Dim sTemp As String = ""
           GetPrivateProfileString(S_WALL, K_WALLBASEDIR, "", sTemp)
-          #If PLATFORM = "x64" Then
-             GetPrivateProfileString(S_WALL, K_WALLBASEDIR64, sTemp, sTemp)
-          #End If
           m_sWallDirPath = sTemp.TrimEnd( "\"c)
       End If
       Return bIsActive

ViewPanel/ViewPanelV.xaml

@@ -9,21 +9,27 @@
       <Button ToolTip="{Binding LookFromTopToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding TopViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromTOP.png" Stretch="Uniform"/>
       </Button>
+      <Button ToolTip="{Binding LookFromBottomToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding BottomViewCommand}">
+         <Image Source="/Resources/GridViewPanel/LookFromBOTTOM.png" Stretch="Uniform"/>
+      </Button>
       <Button ToolTip="{Binding LookFromFrontToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding FrontViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding LookFromRightToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding RightViewCommand}">
-         <Image Source="/Resources/GridViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
-      </Button>
       <Button ToolTip="{Binding LookFromBackToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding BackViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromBACK.png" Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding LookFromLeftToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding LeftViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
       </Button>
+      <Button ToolTip="{Binding LookFromRightToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding RightViewCommand}">
+         <Image Source="/Resources/GridViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
+      </Button>
       <Button ToolTip="{Binding LookFromIso_SWToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewSWCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromISO_SW.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>
    </StackPanel>
 
 </UserControl>

ViewPanel/ViewPanelVM.vb

@@ -8,11 +8,13 @@ Public Class ViewPanelVM
    ' Definizione comandi
    Private m_cmdZoomAll As ICommand
    Private m_cmdTopView As ICommand
+   Private m_cmdBottomView As ICommand
    Private m_cmdFrontView As ICommand
    Private m_cmdLeftView As ICommand
    Private m_cmdBackView As ICommand
    Private m_cmdRightView As ICommand
    Private m_cmdIsoViewSW As ICommand
+   Private m_cmdIsoViewSE As ICommand
 
 #Region "ToolTip"
 
@@ -27,6 +29,11 @@ Public Class ViewPanelVM
          Return EgtMsg(MSG_GRIDVIEWPANEL + 7)
       End Get
    End Property
+   Public ReadOnly Property LookFromBottomToolTip As String
+      Get
+         Return EgtMsg(5284)
+      End Get
+   End Property
 
    Public ReadOnly Property LookFromFrontToolTip As String
       Get
@@ -58,6 +65,12 @@ Public Class ViewPanelVM
       End Get
    End Property
 
+   Public ReadOnly Property LookFromIso_SEToolTip As String
+      Get
+         Return EgtMsg(MSG_GRIDVIEWPANEL + 13)
+      End Get
+   End Property
+
 #End Region    ' ToolTip
 
 #End Region    ' FIELDS & PROPERTIES
@@ -110,6 +123,29 @@ Public Class ViewPanelVM
 
 #End Region ' TopViewCommand
 
+#Region "BottomViewCommand"
+
+   ''' <summary>
+   ''' Returns a command that do TopView.
+   ''' </summary>
+   Public ReadOnly Property BottomViewCommand As ICommand
+      Get
+         If m_cmdBottomView Is Nothing Then
+            m_cmdBottomView = New RelayCommand(AddressOf BottomView)
+         End If
+         Return m_cmdBottomView
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the BottomView.  This method is invoked by the BottomViewCommand.
+   ''' </summary>
+   Public Sub BottomView(ByVal param As Object)
+      Map.refProjectVM.GetScene.BottomView()
+   End Sub
+
+#End Region ' BottomViewCommand
+
 #Region "FrontViewCommand"
 
    ''' <summary>
@@ -225,6 +261,29 @@ Public Class ViewPanelVM
 
 #End Region ' IsoViewSWCommand
 
+#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
+
 #End Region    ' COMMANDS
 
 End Class