From d339d58ad128f77da88941c3d21efc5833ca7a9b Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Fri, 8 May 2026 16:54:16 +0200 Subject: [PATCH] -piccola modifica gestione AdvancedParamIsExpander --- MainWindow/MainWindowVM.vb | 4 ++-- .../MachiningParameterExpanderVM.vb | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 4f3869d..9b715d6 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -608,13 +608,13 @@ Public Class MainWindowVM Map.refMachiningParameterExpanderVM.CurrOperation.SetShowNoteListCombo_IsEnable(True) End If ElseIf (e.Key = Key.Left OrElse e.Key = Key.Right) AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then - Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander = True + If Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander Then Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander = True Map.refMachiningParameterExpanderVM.FocusSlider() Dim nStep As Integer = If(e.Key = Key.Right, 1, -1) Map.refMachiningParameterExpanderVM.SetSliderValue(nStep) 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.CurrOperation.AdvancedParamIsExpander = True + If Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander Then Map.refMachiningParameterExpanderVM.CurrOperation.AdvancedParamIsExpander = True Map.refMachiningParameterExpanderVM.FocusButtonPreview() If e.Key = Key.Down Then Map.refMachiningParameterExpanderVM.RevertPreviewMachiningTool() diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb index f0a3393..5624a03 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb @@ -188,7 +188,11 @@ Public Class MachiningParameterExpanderVM Dim nType As Integer EgtGetMachiningParam(MCH_MP.NAME, sName) EgtGetMachiningParam(MCH_MP.TYPE, nType) + Dim oldValue As Boolean = If(Not IsNothing(m_CurrOperation), m_CurrOperation.AdvancedParamIsExpander, False) + Dim oldOperation As MachiningTreeViewItem = If(Not IsNothing(m_CurrOperation), m_CurrOperation, Nothing) + m_CurrOperation = New MachiningTreeViewItem(sName, DirectCast(nType, MCH_MY)) + m_CurrOperation.AdvancedParamIsExpander = oldValue m_CurrOperation.ReadOperationParam()