diff --git a/MachGroupPanel/MyMachGroupPanelVM.vb b/MachGroupPanel/MyMachGroupPanelVM.vb index cc81e1c..7da36d0 100644 --- a/MachGroupPanel/MyMachGroupPanelVM.vb +++ b/MachGroupPanel/MyMachGroupPanelVM.vb @@ -418,6 +418,8 @@ Public Class MyMachGroupPanelVM (EgtUILib.GetPrivateProfileInt(S_ESTIMATIONS, K_EST_ENABLE, 0, IniFile.m_sCurrMachIniFilePath) <> 0) ' Setto il Materiale in base alla Macchina associata al MachGroup corrente LoadMaterialType() + ' Zoom all + EgtZoom( ZM.ALL) End If Return True diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 70e645f..37469de 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -598,7 +598,7 @@ Public Class MainWindowVM ' pulisco output Map.refStatusBarVM.NotifyStatusOutput("") Map.refInputExpanderVM.ResetInputBox() - ElseIf e.Key = Key.Left AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then + ElseIf e.Key = Key.Left OrElse e.Key = Key.Right OrElse e.Key = Key.Up OrElse e.Key = Key.Down AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then Map.refMachiningParameterExpanderVM.FocusSlider() e.Handled = True End If diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml index 585d5c1..560c058 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml @@ -27,7 +27,7 @@ Style="{StaticResource ViewTool_CheckBox}"/> ''' Funzione che mette il focus allo slider ''' diff --git a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb index 5bd081a..d8d6d10 100644 --- a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb @@ -68,11 +68,10 @@ Public Class OperationParametersExpanderVM Return m_DispositionParameterExpander Else If IsNothing(m_MachiningParameterExpander) Then - m_MachiningParameterExpander = New MachiningParameterExpanderV() m_MachiningParameterExpanderVM = New MachiningParameterExpanderVM() - m_MachiningParameterExpander.DataContext = m_MachiningParameterExpanderVM - ' Associo il gestore evento m_EventFocusOnSlider all'evento generato da FocusOnSlider - AddHandler m_MachiningParameterExpanderVM.m_EventFocusOnSlider, AddressOf m_MachiningParameterExpander.FocusOnSlider + m_MachiningParameterExpander = New MachiningParameterExpanderV With { + .DataContext = m_MachiningParameterExpanderVM + } End If m_MachiningParameterExpanderVM.NotifyPropertyChanged(NameOf(m_MachiningParameterExpanderVM.ParamExpanderPageV)) Return m_MachiningParameterExpander