diff --git a/GridPanel/GridPanelV.xaml b/GridPanel/GridPanelV.xaml index a6aa234..7fb3e1e 100644 --- a/GridPanel/GridPanelV.xaml +++ b/GridPanel/GridPanelV.xaml @@ -6,20 +6,20 @@ + + + - - - - - + + diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb index be49523..c678a97 100644 --- a/MachinePanel/MyMachinePanelVM.vb +++ b/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 diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index b86bc5b..8dd6aa6 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -388,8 +388,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 - EgtGetKeyOptions(3279, 2511, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 2512, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 2512, 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 diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 57d32e0..7fb595c 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ViewPanel/ViewPanelV.xaml b/ViewPanel/ViewPanelV.xaml index e7b906a..5fcdd2c 100644 --- a/ViewPanel/ViewPanelV.xaml +++ b/ViewPanel/ViewPanelV.xaml @@ -9,18 +9,21 @@ + + + - - - + + + diff --git a/ViewPanel/ViewPanelVM.vb b/ViewPanel/ViewPanelVM.vb index 8ff91a6..d7965ed 100644 --- a/ViewPanel/ViewPanelVM.vb +++ b/ViewPanel/ViewPanelVM.vb @@ -8,6 +8,7 @@ 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 @@ -27,6 +28,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 @@ -110,6 +116,29 @@ Public Class ViewPanelVM #End Region ' TopViewCommand +#Region "BottomViewCommand" + + ''' + ''' Returns a command that do TopView. + ''' + 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 + + ''' + ''' Execute the BottomView. This method is invoked by the BottomViewCommand. + ''' + Public Sub BottomView(ByVal param As Object) + Map.refProjectVM.GetScene.BottomView() + End Sub + +#End Region ' BottomViewCommand + #Region "FrontViewCommand" '''