From 5e151fd7ec16aba3cacac08b98ec3cfd04521f8a Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Fri, 6 Mar 2026 12:13:12 +0100
Subject: [PATCH] =?UTF-8?q?-gestito=20in=20modo=20corretto=20la=20visualiz?=
 =?UTF-8?q?zazione=20del=20tool=20tramite=20tasti=20su/gi=C3=B9=20da=20tas?=
 =?UTF-8?q?tiera?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWindow/MainWindowVM.vb                    |  6 +-
 .../MachiningParameterExpanderV.xaml          |  2 +-
 .../MachiningParameterExpanderVM.vb           | 73 ++++++++++++-------
 .../OperationParametersExpanderVM.vb          |  4 +-
 .../OperationsListExpanderVM.vb               |  2 +-
 5 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 42b827a..fc92104 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -606,7 +606,11 @@ Public Class MainWindowVM
          e.Handled = True
       ElseIf (e.Key = Key.Up OrElse e.Key = Key.Down) AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
          Map.refMachiningParameterExpanderVM.FocusButtonPreview()
-         Map.refMachiningParameterExpanderVM.ToolPreview()
+         If e.Key = Key.Down Then
+            Map.refMachiningParameterExpanderVM.RevertPreviewMachiningTool()
+         Else
+            Map.refMachiningParameterExpanderVM.PreviewMachiningTool()
+         End If
          e.Handled = True
       End If
    End Sub
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index 597a3b4..9ecb877 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -86,7 +86,7 @@
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
-         <Button Command="{Binding ToolPreview_Command}"
+         <Button Command="{Binding PreviewMachiningTool_Command}"
                  x:Name="ButtonPreview"
                  Style="{StaticResource PreviewTool_Button}">
             <Image Source="{Binding sToolPreview_Image}" Stretch="Uniform"/>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 5410c1c..2b2edfd 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -19,7 +19,7 @@ Public Class MachiningParameterExpanderVM
          Return m_nPreviewMachiningTool
       End Get
    End Property
-   Friend Sub SetToolLook(value As MCH_LOOK)
+   Friend Sub SetPreviewMachiningTool(value As MCH_LOOK)
       m_nPreviewMachiningTool = value
       NotifyPropertyChanged(NameOf(nPreviewMachiningTool))
    End Sub
@@ -333,7 +333,7 @@ Public Class MachiningParameterExpanderVM
 
    ' Definizione comando
    Private m_cmdUpdateMachining As ICommand
-   Private m_cmdToolPreview As ICommand
+   Private m_cmdPreviewMachiningTool As ICommand
 
 #Region "CONSTRUCTOR"
 
@@ -361,6 +361,44 @@ Public Class MachiningParameterExpanderVM
       RaiseEvent m_EventFocusOnButtonPreview()
    End Sub
 
+   Friend Sub PreviewMachiningTool()
+      Select Case nPreviewMachiningTool
+         Case MCH_LOOK.NONE
+            SetPreviewMachiningTool(MCH_LOOK.TAB_TOOL)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
+            SetSlider_IsEnable(True)
+         Case MCH_LOOK.TAB_TOOL
+            SetPreviewMachiningTool(MCH_LOOK.TAB_HEAD)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Head.png")
+            SetSlider_IsEnable(True)
+         Case MCH_LOOK.TAB_HEAD
+            SetPreviewMachiningTool(MCH_LOOK.NONE)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Delete.png")
+            SetSlider_IsEnable(False)
+      End Select
+      EgtChangePreviewMachiningToolShow(nPreviewMachiningTool)
+      EgtDraw()
+   End Sub
+
+   Friend Sub RevertPreviewMachiningTool()
+      Select Case nPreviewMachiningTool
+         Case MCH_LOOK.NONE
+            SetPreviewMachiningTool(MCH_LOOK.TAB_HEAD)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Head.png")
+            SetSlider_IsEnable(True)
+         Case MCH_LOOK.TAB_TOOL
+            SetPreviewMachiningTool(MCH_LOOK.NONE)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Delete.png")
+            SetSlider_IsEnable(False)
+         Case MCH_LOOK.TAB_HEAD
+            SetPreviewMachiningTool(MCH_LOOK.TAB_TOOL)
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
+            SetSlider_IsEnable(True)
+      End Select
+      EgtChangePreviewMachiningToolShow(nPreviewMachiningTool)
+      EgtDraw()
+   End Sub
+
 #End Region    ' Methods
 
 #Region "COMMANDS"
@@ -449,37 +487,22 @@ Public Class MachiningParameterExpanderVM
 
 #End Region    ' UpdateMachiningCommand
 
-#Region "ToolPreview_Command"
+#Region "PreviewMachiningTool_Command"
 
-   Public ReadOnly Property ToolPreview_Command As ICommand
+   Public ReadOnly Property PreviewMachiningTool_Command As ICommand
       Get
-         If m_cmdToolPreview Is Nothing Then
-            m_cmdToolPreview = New RelayCommand(AddressOf ToolPreview)
+         If m_cmdPreviewMachiningTool Is Nothing Then
+            m_cmdPreviewMachiningTool = New RelayCommand(AddressOf PreviewMachiningTool)
          End If
-         Return m_cmdToolPreview
+         Return m_cmdPreviewMachiningTool
       End Get
    End Property
 
-   Public Sub ToolPreview()
-      Select Case nPreviewMachiningTool
-         Case MCH_LOOK.NONE
-            SetToolLook(MCH_LOOK.TAB_TOOL)
-            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
-            SetSlider_IsEnable(True)
-         Case MCH_LOOK.TAB_TOOL
-            SetToolLook(MCH_LOOK.TAB_HEAD)
-            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Head.png")
-            SetSlider_IsEnable(True)
-         Case MCH_LOOK.TAB_HEAD
-            SetToolLook(MCH_LOOK.NONE)
-            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Delete.png")
-            SetSlider_IsEnable(False)
-      End Select
-      EgtChangePreviewMachiningToolShow(nPreviewMachiningTool)
-      EgtDraw()
+   Public Sub PreviewMachiningTool(ByVal param As Object)
+      PreviewMachiningTool()
    End Sub
 
-#End Region    ' ToolPreview_Command
+#End Region    ' PreviewMachiningTool_Command
 
 #End Region    ' Commands
 
diff --git a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb
index 09de640..2e9be37 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_SelGeomProbing
          End Select
          ' Imposto visualizzazione utensile
-         Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.TAB_TOOL)
+         Map.refMachiningParameterExpanderVM.SetPreviewMachiningTool(MCH_LOOK.TAB_TOOL)
          Map.refMachiningParameterExpanderVM.SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
          Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(True)
          EgtPreparePreviewMachiningTool()
@@ -212,7 +212,7 @@ Public Class OperationParametersExpanderVM
          EgtDraw()
       Else
          ' Nascondo visualizzazione utensile
-         Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.NONE)
+         Map.refMachiningParameterExpanderVM.SetPreviewMachiningTool(MCH_LOOK.NONE)
          Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False)
          Map.refMachiningParameterExpanderVM.ResetSliderValue()
          EgtRemovePreviewMachiningTool()
diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
index 1eb558b..74c9652 100644
--- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
@@ -1303,7 +1303,7 @@ Public Class OperationsListExpanderVM
       If m_NewMachining Then EndNewMachining(GDB_ID.NULL)
       ' Disabilito visualizzazione utensile
       If Not IsNothing(Map.refMachiningParameterExpanderVM) Then
-         Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.NONE)
+         Map.refMachiningParameterExpanderVM.SetPreviewMachiningTool(MCH_LOOK.NONE)
          Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False)
          Map.refMachiningParameterExpanderVM.ResetSliderValue()
          EgtRemovePreviewMachiningTool()