From 3ebba7cb81ba17c58d5fa0295dca5178bab1dde7 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Wed, 29 May 2024 12:15:13 +0200
Subject: [PATCH 1/8] -rimossa variabile tipo approccio da finitura superficie
 e sgrossatura

---
 MachinePanel/MyMachinePanelVM.vb                            | 4 ++--
 .../SurfFinishingParameterExpanderV.xaml                    | 6 ------
 .../SurfRoughingParameterExpanderV.xaml                     | 6 ------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index c678a97..41f4748 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -269,7 +269,7 @@ Public Class MyMachinePanelVM
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True)
       Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 794 '674
+         MachDbWindowV.Height = 830 '674
          MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()
@@ -290,7 +290,7 @@ Public Class MyMachinePanelVM
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True)
       Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 794 '674
+         MachDbWindowV.Height = 830 '674
          MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml
index 84fc9b7..bfc6bc6 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml
@@ -124,12 +124,6 @@
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadLinkTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=LeadLinkTypeList,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
-                                       Style="{DynamicResource ComboParamV_Margin}"/>
                <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
                                         ParamTxBx="{Binding Path=SideAngle,
                                                             UpdateSourceTrigger=PropertyChanged,
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml
index 416b056..6cef9a4 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml
@@ -119,12 +119,6 @@
                                                             UpdateSourceTrigger=PropertyChanged,
                                                             ValidatesOnDataErrors=True}" 
                                         Style="{DynamicResource StringParamV_Margin}"/>
-               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadLinkTypeTxBl}" 
-                                       ParamCmBxList="{Binding Path=LeadLinkTypeList,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}"
-                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
-                                       Style="{DynamicResource ComboParamV_Margin}"/>
                <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
                                         ParamTxBx="{Binding Path=SideAngle,
                                                             UpdateSourceTrigger=PropertyChanged,

From d328fbb186627fa1d15414bb1518b77052b1b4af Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Wed, 29 May 2024 14:57:49 +0200
Subject: [PATCH 2/8] -ripristinato dimensione pagina db lavorazioni

---
 MachinePanel/MyMachinePanelVM.vb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index 41f4748..3f0d0e0 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -269,7 +269,7 @@ Public Class MyMachinePanelVM
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True)
       Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 830 '674
+         MachDbWindowV.Height = 800 '674
          MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()
@@ -290,7 +290,7 @@ Public Class MyMachinePanelVM
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True)
       Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 830 '674
+         MachDbWindowV.Height = 800 '674
          MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()

From cfa709fb40fdef6115d43d4678414d9f9da0cf4b Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Thu, 30 May 2024 12:14:23 +0200
Subject: [PATCH 3/8] -aggiunto slider da completare

---
 .../MachiningParameterExpanderV.xaml          | 67 ++++++++++++-------
 .../MachiningParameterExpanderVM.vb           | 56 +++++++---------
 .../OperationsListExpanderVM.vb               |  1 +
 Utility/Map.vb                                | 13 +++-
 4 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index 61333e7..c1b7940 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="MachiningParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
       <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -73,26 +73,43 @@
       <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
       <sys:Int32 x:Key="TabMax">62</sys:Int32>
       <sys:Int32 x:Key="TabMin">63</sys:Int32>
-    </UserControl.Resources>
+   </UserControl.Resources>
 
-    <StackPanel>
-        <ContentControl Content="{Binding Path=ParamExpanderPageV}" />
+   <StackPanel>
+      <ContentControl Content="{Binding Path=ParamExpanderPageV}" />
 
-        <Button Name="ApplyMachBtn" Height="30" Content="{Binding UpdateMachiningBtnMsg}"
-             Command="{Binding UpdateMachiningCommand}" Background="{Binding UpdateMachiningBtn_Background}"/>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <ToggleButton Name="ViewToolBtn" Grid.Column="0" Height="30" Content="{Binding ViewToolBtnMsg}"
-                IsChecked="{Binding ViewTool}" />
-            <Button Name="NextStepToolBtn" Grid.Column="1" Height="30" Content="{Binding NextStepToolBtnMsg}"
-                Command="{Binding NextStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
-            <Button Name="PrevStepToolBtn" Grid.Column="2" Height="30" Content="{Binding PrevStepToolBtnMsg}"
-                Command="{Binding PrevStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
-        </Grid>
-    </StackPanel>
+      <Button Name="ApplyMachBtn" Height="30" Content="{Binding UpdateMachiningBtnMsg}"
+              Command="{Binding UpdateMachiningCommand}" Background="{Binding UpdateMachiningBtn_Background}"/>
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <ToggleButton Name="ViewToolBtn" Grid.Column="0" Height="30" Content="{Binding ViewToolBtnMsg}"
+                       IsChecked="{Binding ViewTool}" />
+         <Button Name="PrevStepToolBtn" Grid.Column="1" Height="30" Content="{Binding PrevStepToolBtnMsg}"
+                 Command="{Binding PrevStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
+         <Button Name="NextStepToolBtn" Grid.Column="2" Height="30" Content="{Binding NextStepToolBtnMsg}"
+                 Command="{Binding NextStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
+
+         <Slider Grid.Row="1" 
+                 Grid.ColumnSpan="3"
+                 Value="{Binding SliderValue}"
+                 SmallChange="1"
+                 TickPlacement="TopLeft"
+                 TickFrequency="5"
+                 Minimum="0"
+                 Maximum="700"
+                 IsSnapToTickEnabled="False"
+                 Width="245"
+                 Margin="0,5,0,0"/>
+
+      </Grid>
+   </StackPanel>
 
 </UserControl>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 84b4946..056cf78 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -69,6 +69,28 @@ Public Class MachiningParameterExpanderVM
       End Set
    End Property
 
+   ' Slider per muovere l'utensile in aggiunta ai pulsanti indietro e avanti
+   Private nId As Integer = 0
+   Private m_SliderValue As Integer
+   Public Property SliderValue As Integer
+      Get
+         Return m_SliderValue
+      End Get
+      Set(value As Integer)
+         If m_bPreviewTool Then
+            If value < m_SliderValue Then
+               nId = EgtPreviewMachiningTool(m_nPtEntId, MCH_PTM.BEFORE)
+            Else
+               nId = EgtPreviewMachiningTool(m_nPtEntId, MCH_PTM.AFTER) + (value - m_SliderValue)
+            End If
+            If nId <> GDB_ID.NULL Then m_nPtEntId = nId
+            EgtDraw()
+         End If
+         m_SliderValue = value
+         NotifyPropertyChanged(NameOf(SliderValue))
+      End Set
+   End Property
+
    Dim WoodDrillParamExpanderV As WoodDrillingParameterExpanderV
    Dim WoodSawParamExpanderV As WoodSawingParameterExpanderV
    Dim WoodMillParamExpanderV As WoodMillingParameterExpanderV
@@ -108,22 +130,6 @@ Public Class MachiningParameterExpanderVM
          EgtGetMachiningParam(MCH_MP.TYPE, nType)
          m_CurrOperation = New MachiningTreeViewItem(sName, DirectCast(nType, MCH_MY))
 
-         'WoodDrillParamExpanderV.DataContext = Nothing
-         'WoodSawParamExpanderV.DataContext = Nothing
-         'WoodMillParamExpanderV.DataContext = Nothing
-         'BeamMillParamExpanderV.DataContext = Nothing
-         'PocketParamExpanderV.DataContext = Nothing
-         'MortiseParamExpanderV.DataContext = Nothing
-         'GenMachinParamExpanderV.DataContext = Nothing
-         'ChiselParamExpanderV.DataContext = Nothing
-         'StoneSawParamExpanderV.DataContext = Nothing
-         'StoneSawFinishParamExpanderV.DataContext = Nothing
-         'StoneSawRoughParamExpanderV.DataContext = Nothing
-         'StoneMillParamExpanderV.DataContext = Nothing
-         'StoneDrillParamExpanderV.DataContext = Nothing
-         'SurfFinishParamExpanderV.DataContext = Nothing
-         'WjParamExpanderV.DataContext = Nothing
-
          m_CurrOperation.ReadOperationParam()
 
          IsModified(False)
@@ -267,23 +273,7 @@ Public Class MachiningParameterExpanderVM
 
    Sub New()
       EgtWPFLib5.MachiningDbWindowVM.m_sMachineIniPath = IniFile.m_sCurrMachIniFilePath
-
-      'WoodDrillParamExpanderV = New WoodDrillingParameterExpanderV
-      'WoodSawParamExpanderV = New WoodSawingParameterExpanderV
-      'WoodMillParamExpanderV = New WoodMillingParameterExpanderV
-      'BeamMillParamExpanderV = New BeamMillingParameterExpanderV
-      'PocketParamExpanderV = New PocketingParameterExpanderV
-      'MortiseParamExpanderV = New MortisingParameterExpanderV
-      'GenMachinParamExpanderV = New GenMachiningParameterExpanderV
-      'ChiselParamExpanderV = New ChiselingParameterExpanderV
-      'StoneSawParamExpanderV = New StoneSawingParameterExpanderV
-      'StoneSawFinishParamExpanderV = New StoneSawFinishingParameterExpanderV
-      'StoneSawRoughParamExpanderV = New StoneSawRoughingParameterExpanderV
-      'StoneMillParamExpanderV = New StoneMillingParameterExpanderV
-      'StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
-      'SurfFinishParamExpanderV = New SurfFinishingParameterExpanderV
-      'WjParamExpanderV = New WaterjettingParameterExpanderV
-
+      Map.SetRefMachiningParameterExpanderVM(Me)
       NotifyPropertyChanged("ParamExpanderPageV")
    End Sub
 
diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
index fdb7238..33a2544 100644
--- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
@@ -433,6 +433,7 @@ Public Class OperationsListExpanderVM
 
       If EgtGetOperationMode(selOperation.Id) Then
          Map.refOperationParametersExpanderVM.ParametersIsExpanded = True
+         Map.refMachiningParameterExpanderVM.SliderValue = 0
       End If
    End Sub
 
diff --git a/Utility/Map.vb b/Utility/Map.vb
index c100b0e..76b6523 100644
--- a/Utility/Map.vb
+++ b/Utility/Map.vb
@@ -34,6 +34,7 @@ Module Map
    Private m_refWallPanelVM As WallPanelVM
    Private m_refBeamWallPanelVM As BeamWallPanelVM
    Private m_refGunStockPanelVM As GunStockPanelVM
+   Private m_refMachiningParameterExpanderVM As MachiningParameterExpanderVM
 
 #Region "Get"
 
@@ -187,6 +188,11 @@ Module Map
          Return m_refGunStockPanelVM
       End Get
    End Property
+   Public ReadOnly Property refMachiningParameterExpanderVM As MachiningParameterExpanderVM
+      Get
+         Return m_refMachiningParameterExpanderVM
+      End Get
+   End Property
 
 #End Region    ' Get
 
@@ -309,6 +315,10 @@ Module Map
       m_refGunStockPanelVM = GunStockPanelVM
       Return Not IsNothing(m_refGunStockPanelVM)
    End Function
+   Friend Function SetRefMachiningParameterExpanderVM(MachiningParameterExpanderVM As MachiningParameterExpanderVM) As Boolean
+      m_refMachiningParameterExpanderVM = MachiningParameterExpanderVM
+      Return Not IsNothing(m_refMachiningParameterExpanderVM)
+   End Function
 
 #End Region    ' Set
 
@@ -327,7 +337,8 @@ Module Map
              Not IsNothing(m_refOperationParametersExpanderVM) AndAlso Not IsNothing(m_refMachiningTreeExpanderVM) AndAlso
              Not IsNothing(LibMap.refMachGroupPanelVM) AndAlso Not IsNothing(m_refInstrumentPanelVM) AndAlso Not IsNothing(m_refManageLayerExpanderVM) AndAlso
              Not IsNothing(m_refInputExpanderVM) AndAlso Not IsNothing(m_refShowPanelVM) AndAlso Not IsNothing(m_refInfoExpanderVM) AndAlso
-             Not IsNothing(m_refDrawPanelVM) AndAlso Not IsNothing(m_refProjectV) AndAlso Not IsNothing(m_refDoorPanelVM) AndAlso Not IsNothing(m_refSpecialPanelVM)
+             Not IsNothing(m_refDrawPanelVM) AndAlso Not IsNothing(m_refProjectV) AndAlso Not IsNothing(m_refDoorPanelVM) AndAlso Not IsNothing(m_refSpecialPanelVM) AndAlso
+             Not IsNothing(m_refMachiningParameterExpanderVM)
    End Function
 
 #End Region    ' Init

From 8164b2e654b3570e8dbc1154bdce80ac28e504e8 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Fri, 31 May 2024 07:59:02 +0200
Subject: [PATCH 4/8] EgtCAM5 : - modifiche per ToolPreview con slider.

---
 .../MachiningParameterExpanderV.xaml          |  6 +-
 .../MachiningParameterExpanderVM.vb           | 55 ++++++++++++++-----
 .../OperationParametersExpanderVM.vb          |  4 +-
 .../OperationsListExpanderVM.vb               |  5 +-
 4 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index c1b7940..17d95c4 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -102,9 +102,9 @@
                  Value="{Binding SliderValue}"
                  SmallChange="1"
                  TickPlacement="TopLeft"
-                 TickFrequency="5"
-                 Minimum="0"
-                 Maximum="700"
+                 TickFrequency="{Binding SliderTick}"
+                 Minimum="1"
+                 Maximum="{Binding SliderScale}"
                  IsSnapToTickEnabled="False"
                  Width="245"
                  Margin="0,5,0,0"/>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 056cf78..9edccb9 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -50,7 +50,6 @@ Public Class MachiningParameterExpanderVM
    End Property
 
    Private m_bPreviewTool As Boolean = False
-   Private m_nPtEntId As Integer = GDB_ID.NULL
    Public Property ViewTool As Boolean
       Get
          Return m_bPreviewTool
@@ -58,38 +57,66 @@ Public Class MachiningParameterExpanderVM
       Set(value As Boolean)
          If value Then
             EgtPreparePreviewMachiningTool()
-            m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
             m_bPreviewTool = True
+            ResetSliderValue()
          Else
             EgtRemovePreviewMachiningTool()
             m_bPreviewTool = False
+            ResetSliderValue()
          End If
          EgtDraw()
-         NotifyPropertyChanged("ViewTool")
       End Set
    End Property
+   Friend Sub SetViewTool(value As Boolean)
+      ViewTool = value
+      NotifyPropertyChanged("ViewTool")
+   End Sub
 
    ' Slider per muovere l'utensile in aggiunta ai pulsanti indietro e avanti
-   Private nId As Integer = 0
-   Private m_SliderValue As Integer
+   Private m_SliderScale As Integer = 100
+   Public ReadOnly Property SliderScale As Integer
+      Get
+         Return m_SliderScale
+      End Get
+   End Property
+   Friend Sub SetSliderScale(value As Integer)
+      m_SliderScale = Math.Max( value, 1)
+      m_SliderTick = CInt( m_SliderScale / 10)
+      NotifyPropertyChanged( NameOf(SliderScale))
+      NotifyPropertyChanged( NameOf(SliderTick))
+   End Sub 
+
+   Private m_SliderTick As Integer = 10
+   Public ReadOnly Property SliderTick As Integer
+      Get
+         Return m_SliderTick
+      End Get
+   End Property
+
+   Private m_nPtEntId As Integer = GDB_ID.NULL
+   Private m_SliderValue As Integer = 1
    Public Property SliderValue As Integer
       Get
          Return m_SliderValue
       End Get
       Set(value As Integer)
          If m_bPreviewTool Then
-            If value < m_SliderValue Then
-               nId = EgtPreviewMachiningTool(m_nPtEntId, MCH_PTM.BEFORE)
-            Else
-               nId = EgtPreviewMachiningTool(m_nPtEntId, MCH_PTM.AFTER) + (value - m_SliderValue)
-            End If
+            Dim nId As Integer = EgtPreviewMachiningTool(m_nPtEntId, value - m_SliderValue)
             If nId <> GDB_ID.NULL Then m_nPtEntId = nId
             EgtDraw()
          End If
          m_SliderValue = value
-         NotifyPropertyChanged(NameOf(SliderValue))
       End Set
    End Property
+   Friend Sub ResetSliderValue()
+      If m_bPreviewTool Then
+         m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
+      Else
+         m_nPtEntId = GDB_ID.NULL
+      End If
+      m_SliderValue = 1
+      NotifyPropertyChanged(NameOf(SliderValue))
+   End Sub
 
    Dim WoodDrillParamExpanderV As WoodDrillingParameterExpanderV
    Dim WoodSawParamExpanderV As WoodSawingParameterExpanderV
@@ -443,10 +470,8 @@ Public Class MachiningParameterExpanderVM
          End If
       End If
       ' Restart visualizzazione utensile
-      If m_bPreviewTool Then
-         EgtPreparePreviewMachiningTool()
-         m_nPtEntId = EgtPreviewMachiningTool(GDB_ID.NULL, MCH_PTM.AFTER)
-      End If
+      SetSliderScale( EgtGetPreviewMachiningToolStepCount())
+      ResetSliderValue()
       IsModified(False) ' NotifyPropertyChanged("UpdateMachiningBtn_Background")
       ErrorOnOperation(False)
       EgtDraw()
diff --git a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb
index 7bc7e2f..f1f0315 100644
--- a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb
@@ -178,7 +178,7 @@ Public Class OperationParametersExpanderVM
                Map.refProjectVM.SceneSelMode = OptionModule.m_SelGeomFiveAxMilling
          End Select
          ' Imposto visualizzazione utensile
-         DirectCast(m_MachiningParameterExpander.DataContext, MachiningParameterExpanderVM).ViewTool = True
+         Map.refMachiningParameterExpanderVM.SetViewTool( True)
       End If
       OnPropertyChanged("ParametersIsExpanded")
       Return True
@@ -208,7 +208,7 @@ Public Class OperationParametersExpanderVM
          EgtDraw()
       Else
          ' Nascondo visualizzazione utensile
-         DirectCast(m_MachiningParameterExpander.DataContext, MachiningParameterExpanderVM).ViewTool = False
+         Map.refMachiningParameterExpanderVM.SetViewTool( False)
       End If
       ParametersExpanderName = String.Empty
       ' Disabilito la selezione delle lavorazioni
diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
index 33a2544..0b29184 100644
--- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
@@ -433,7 +433,8 @@ Public Class OperationsListExpanderVM
 
       If EgtGetOperationMode(selOperation.Id) Then
          Map.refOperationParametersExpanderVM.ParametersIsExpanded = True
-         Map.refMachiningParameterExpanderVM.SliderValue = 0
+         Map.refMachiningParameterExpanderVM.SetSliderScale( EgtGetPreviewMachiningToolStepCount())
+         Map.refMachiningParameterExpanderVM.ResetSliderValue()
       End If
    End Sub
 
@@ -1251,7 +1252,7 @@ Public Class OperationsListExpanderVM
       If m_NewMachining Then EndNewMachining(GDB_ID.NULL)
       ' Disabilito visualizzazione utensile
       If Not IsNothing(m_MachiningParameterExpander) Then
-         DirectCast(m_MachiningParameterExpander.DataContext, MachiningParameterExpanderVM).ViewTool = False
+         Map.refMachiningParameterExpanderVM.SetViewTool( False)
       End If
       ' Deseleziono le operazioni correnti per eliminare il mark
       For Each Operation In OperationList

From 0a4a7c4efad1d4bde9e7d23e4d9a90fd73626ef3 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Fri, 31 May 2024 11:34:27 +0200
Subject: [PATCH 5/8] -rimosso pulsanti indietro e avanti -cambiato pulsante
 anteprima utensile con checkbox

---
 OptionPanel/DrawOptionPanelV.xaml             |   9 +-
 .../MachiningParameterExpanderV.xaml          |  20 +-
 .../MachiningParameterExpanderVM.vb           |  57 +----
 OptionPanel/MachiningOptionPanelV.xaml        |   9 +-
 Utility/Dictionary.xaml                       | 204 +++++++++---------
 5 files changed, 122 insertions(+), 177 deletions(-)

diff --git a/OptionPanel/DrawOptionPanelV.xaml b/OptionPanel/DrawOptionPanelV.xaml
index 808bf97..8072f0c 100644
--- a/OptionPanel/DrawOptionPanelV.xaml
+++ b/OptionPanel/DrawOptionPanelV.xaml
@@ -1,10 +1,9 @@
 <UserControl x:Class="DrawOptionPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
 
-   <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+   <StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <!--ContentPresenter that contains the ManageLayerExpander-->
       <ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
       <!--ContentPresenter that contains the InfoExpander-->
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index 17d95c4..1db2946 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -86,28 +86,22 @@
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <ToggleButton Name="ViewToolBtn" Grid.Column="0" Height="30" Content="{Binding ViewToolBtnMsg}"
-                       IsChecked="{Binding ViewTool}" />
-         <Button Name="PrevStepToolBtn" Grid.Column="1" Height="30" Content="{Binding PrevStepToolBtnMsg}"
-                 Command="{Binding PrevStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
-         <Button Name="NextStepToolBtn" Grid.Column="2" Height="30" Content="{Binding NextStepToolBtnMsg}"
-                 Command="{Binding NextStepToolCommand}" IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"/>
+
+         <CheckBox Name="ViewToolBtn"
+                   Content="{Binding ViewToolBtnMsg}"
+                   IsChecked="{Binding ViewTool}"
+                   Style="{StaticResource ViewTool_CheckBox}"/>
 
          <Slider Grid.Row="1" 
-                 Grid.ColumnSpan="3"
                  Value="{Binding SliderValue}"
-                 SmallChange="1"
-                 TickPlacement="TopLeft"
+                 IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"
                  TickFrequency="{Binding SliderTick}"
                  Minimum="1"
                  Maximum="{Binding SliderScale}"
                  IsSnapToTickEnabled="False"
-                 Width="245"
-                 Margin="0,5,0,0"/>
+                 Style="{StaticResource SliderValue_Slider}"/>
 
       </Grid>
    </StackPanel>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 9edccb9..617cf3a 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -308,60 +308,6 @@ Public Class MachiningParameterExpanderVM
 
 #Region "COMMANDS"
 
-#Region "NextStepToolCommand"
-
-   ''' <summary>
-   ''' Restituisce funzione per ricalcolo lavorazione.
-   ''' </summary>
-   Public ReadOnly Property NextStepToolCommand As ICommand
-      Get
-         If m_cmdNextStepTool Is Nothing Then
-            m_cmdNextStepTool = New RelayCommand(AddressOf NextStepTool)
-         End If
-         Return m_cmdNextStepTool
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Ricalcola una lavorazione.
-   ''' </summary>
-   Public Sub NextStepTool(ByVal param As Object)
-      If m_bPreviewTool Then
-         Dim nNextId = EgtPreviewMachiningTool(m_nPtEntId, MCH_PTM.AFTER)
-         If nNextId <> GDB_ID.NULL Then m_nPtEntId = nNextId
-         EgtDraw()
-      End If
-   End Sub
-
-#End Region    ' NextStepToolCommand
-
-#Region "PrevStepToolCommand"
-
-   ''' <summary>
-   ''' Restituisce funzione per ricalcolo lavorazione.
-   ''' </summary>
-   Public ReadOnly Property PrevStepToolCommand As ICommand
-      Get
-         If m_cmdPrevStepTool Is Nothing Then
-            m_cmdPrevStepTool = New RelayCommand(AddressOf PrevStepTool)
-         End If
-         Return m_cmdPrevStepTool
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Ricalcola una lavorazione.
-   ''' </summary>
-   Public Sub PrevStepTool(ByVal param As Object)
-      If m_bPreviewTool Then
-         Dim nPrevId = EgtPreviewMachiningTool(m_nPtEntId, MCH_PTM.BEFORE)
-         If nPrevId <> GDB_ID.NULL Then m_nPtEntId = nPrevId
-         EgtDraw()
-      End If
-   End Sub
-
-#End Region    ' PrevStepToolCommand
-
 #Region "UpdateMachiningCommand"
 
    ''' <summary>
@@ -472,7 +418,8 @@ Public Class MachiningParameterExpanderVM
       ' Restart visualizzazione utensile
       SetSliderScale( EgtGetPreviewMachiningToolStepCount())
       ResetSliderValue()
-      IsModified(False) ' NotifyPropertyChanged("UpdateMachiningBtn_Background")
+      SetViewTool(True)
+      IsModified(False)
       ErrorOnOperation(False)
       EgtDraw()
       Map.refProjectVM.EmitTitle()
diff --git a/OptionPanel/MachiningOptionPanelV.xaml b/OptionPanel/MachiningOptionPanelV.xaml
index 8bf918d..28b98ea 100644
--- a/OptionPanel/MachiningOptionPanelV.xaml
+++ b/OptionPanel/MachiningOptionPanelV.xaml
@@ -1,10 +1,9 @@
 <UserControl x:Class="MachiningOptionPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
 
-   <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+   <StackPanel Name="ciao" Background="Transparent" Margin="0,0,3.5001,0" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <!--ContentPresenter that contains the OperationsListExpander-->
       <ContentPresenter Content="{Binding OperationsListExpander,Mode=OneWay}"/>
       <!--ContentPresenter that contains the OperationParametersExpander-->
diff --git a/Utility/Dictionary.xaml b/Utility/Dictionary.xaml
index 7947cfe..206cc23 100644
--- a/Utility/Dictionary.xaml
+++ b/Utility/Dictionary.xaml
@@ -459,7 +459,7 @@
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
    </Style>
-   
+
    <Style x:Key="MachiningsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="Margin" Value="10,0,0,0"/>
    </Style>
@@ -1149,41 +1149,41 @@
       </Setter>
    </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- GroupBox with margins -->
+   <!-- GroupBox with margins -->
 
-    <Style x:Key="GroupBoxStyle_Margin" TargetType="{x:Type GroupBox}">
-        <Setter Property="Margin" Value="3,0"/>
-    </Style>
+   <Style x:Key="GroupBoxStyle_Margin" TargetType="{x:Type GroupBox}">
+      <Setter Property="Margin" Value="3,0"/>
+   </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- GroupBox with margins and no header -->
+   <!-- GroupBox with margins and no header -->
 
-    <Style x:Key="GroupBoxStyle_NoHeader" TargetType="{x:Type GroupBox}">
-        <Setter Property="Margin" Value="3,0"/>
-        <Setter Property="BorderBrush" Value="#FFD5DFE5"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type GroupBox}">
-                    <Grid SnapsToDevicePixels="True">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="6"/>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="6"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="6"/>
-                        </Grid.RowDefinitions>
-                        <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
-                        <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
-                            <!--<Border.OpacityMask>
+   <Style x:Key="GroupBoxStyle_NoHeader" TargetType="{x:Type GroupBox}">
+      <Setter Property="Margin" Value="3,0"/>
+      <Setter Property="BorderBrush" Value="#FFD5DFE5"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type GroupBox}">
+               <Grid SnapsToDevicePixels="True">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="6"/>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="*"/>
+                     <ColumnDefinition Width="6"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="*"/>
+                     <RowDefinition Height="6"/>
+                  </Grid.RowDefinitions>
+                  <Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
+                  <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
+                     <!--<Border.OpacityMask>
                                     <MultiBinding ConverterParameter="7" UpdateSourceTrigger="Default">
                                         <MultiBinding.Converter>
                                             <BorderGapMaskConverter/>
@@ -1193,77 +1193,83 @@
                                         <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
                                     </MultiBinding>
                                 </Border.OpacityMask>-->
-                            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
-                                <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
-                            </Border>
-                        </Border>
-                        <Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2">
-                            <ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                        <ContentPresenter Grid.ColumnSpan="2" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" ContentStringFormat="{TemplateBinding ContentStringFormat}" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-    <!-- Margin for TextBlocks and TextBoxes in MachiningParameterExpander not from EgtWPFLib5 -->
-
-    <Style x:Key="MPExpander_DepthTxBlMargin" TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="1,3,0,0"/>
-    </Style>
-
-    <Style x:Key="MPExpander_DepthTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
-        <Setter Property="Margin" Value="-1,0,0,0"/>
-    </Style>
-
-    <Style x:Key="MPExpander_UserNotesTxBlMargin" TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="1,0,0,0"/>
-    </Style>
-
-    <Style x:Key="MPExpander_UserNotesTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
-        <Setter Property="Margin" Value="-1,0,0,0"/>
-    </Style>
-
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-    <!-- Margin for UserControls in MachiningParameterExpander from EgtWPFLib5 -->
-
-    <Style x:Key="StringParamV_Margin" TargetType="{x:Type EgtWPFLib5:StringParamV}">
-        <Setter Property="Margin" Value="-3"/>
-    </Style>
-
-    <Style x:Key="ComboParamV_Margin" TargetType="{x:Type EgtWPFLib5:ComboParamV}">
-        <Setter Property="Margin" Value="-3"/>
-    </Style>
-
-    <Style x:Key="CheckParamV_Margin" TargetType="{x:Type EgtWPFLib5:CheckParamV}">
-        <Setter Property="Margin" Value="-3"/>
-    </Style>
-
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-
-   <Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="ListBoxItem">
-               <Border Name="_Border"
-                       SnapsToDevicePixels="True"
-                       BorderBrush="{StaticResource EgaltechWhite}"
-                       BorderThickness="1">
-                  <ContentPresenter />
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsSelected" Value="True">
-                     <Setter TargetName="_Border" Property="Background" Value="{StaticResource Button.Pressed.Background}"/>
-                  </Trigger>
-               </ControlTemplate.Triggers>
+                     <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
+                        <Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
+                     </Border>
+                  </Border>
+                  <Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2">
+                     <ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Border>
+                  <ContentPresenter Grid.ColumnSpan="2" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" ContentStringFormat="{TemplateBinding ContentStringFormat}" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+               </Grid>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
    </Style>
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- Margin for TextBlocks and TextBoxes in MachiningParameterExpander not from EgtWPFLib5 -->
+
+   <Style x:Key="MPExpander_DepthTxBlMargin" TargetType="{x:Type TextBlock}">
+      <Setter Property="Margin" Value="1,3,0,0"/>
+   </Style>
+
+   <Style x:Key="MPExpander_DepthTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
+      <Setter Property="Margin" Value="-1,0,0,0"/>
+   </Style>
+
+   <Style x:Key="MPExpander_UserNotesTxBlMargin" TargetType="{x:Type TextBlock}">
+      <Setter Property="Margin" Value="1,0,0,0"/>
+   </Style>
+
+   <Style x:Key="MPExpander_UserNotesTxBxMargin" TargetType="{x:Type EgtWPFLib5:EgtTextBox}">
+      <Setter Property="Margin" Value="-1,0,0,0"/>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- Margin for UserControls in MachiningParameterExpander from EgtWPFLib5 -->
+
+   <Style x:Key="StringParamV_Margin" TargetType="{x:Type EgtWPFLib5:StringParamV}">
+      <Setter Property="Margin" Value="-3"/>
+   </Style>
+
+   <Style x:Key="ComboParamV_Margin" TargetType="{x:Type EgtWPFLib5:ComboParamV}">
+      <Setter Property="Margin" Value="-3"/>
+   </Style>
+
+   <Style x:Key="CheckParamV_Margin" TargetType="{x:Type EgtWPFLib5:CheckParamV}">
+      <Setter Property="Margin" Value="-3"/>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- Style Slider -->
+   
+   <Style x:Key="SliderValue_Slider" TargetType="{x:Type Slider}">
+      <Setter Property="Width" Value="235"/>
+      <Setter Property="SmallChange" Value="1"/>
+      <Setter Property="TickPlacement" Value="TopLeft"/>
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="Opacity" Value="0.5"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- Style CheckBox -->
+
+   <Style x:Key="ViewTool_CheckBox" TargetType="{x:Type CheckBox}">
+      <Setter Property="Margin"  Value="0,10,0,5"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <!--<Style.Triggers>
+         <Trigger Property="IsChecked" Value="True">
+            <Setter Property="Foreground" Value="#FF50E6FD"/>
+         </Trigger>
+      </Style.Triggers>-->
+   </Style>
+
 </ResourceDictionary>

From 459d6f6739c79b508ab3abc5a962f151e53d3359 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Fri, 31 May 2024 12:03:17 +0200
Subject: [PATCH 6/8] EgtCAM5 : - piccola miglioria a SliderThick di
 MachiningToolPreviw.

---
 .../MachiningParameterExpanderVM.vb                         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 617cf3a..8503c7b 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -81,7 +81,11 @@ Public Class MachiningParameterExpanderVM
    End Property
    Friend Sub SetSliderScale(value As Integer)
       m_SliderScale = Math.Max( value, 1)
-      m_SliderTick = CInt( m_SliderScale / 10)
+      If m_SliderScale <= 10 Then
+         m_SliderTick = 1
+      Else
+         m_SliderTick = CInt( m_SliderScale / 10)
+      End If
       NotifyPropertyChanged( NameOf(SliderScale))
       NotifyPropertyChanged( NameOf(SliderTick))
    End Sub 

From f506ce9c64490b7a2f7e3ace0adf1c903a3a64ee Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Fri, 31 May 2024 12:13:21 +0200
Subject: [PATCH 7/8] EgtCAM5 : - piccola ottimazione in MachiningToolSlider.

---
 .../MachiningParameterExpander/MachiningParameterExpanderVM.vb   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 8503c7b..6d82b8a 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -421,7 +421,6 @@ Public Class MachiningParameterExpanderVM
       End If
       ' Restart visualizzazione utensile
       SetSliderScale( EgtGetPreviewMachiningToolStepCount())
-      ResetSliderValue()
       SetViewTool(True)
       IsModified(False)
       ErrorOnOperation(False)

From b3d113e4f368fe9a34a70e3f056b92d13bde9255 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Fri, 31 May 2024 12:29:06 +0200
Subject: [PATCH 8/8] EgtCAM5 : - corretta partenza disegno continuo (Ctrl) su
 Arco con punto, direzione e punto.

---
 DrawPanel/DrawPanelVM.vb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb
index 16c1363..20ffab5 100644
--- a/DrawPanel/DrawPanelVM.vb
+++ b/DrawPanel/DrawPanelVM.vb
@@ -770,6 +770,7 @@ Public Class DrawPanelVM
          Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPVP)
       ElseIf (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
          Map.refProjectVM.GetController.SetContinue()
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP)
       Else
          Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP)
       End If