diff --git a/Application.xaml.vb b/Application.xaml.vb index cb15439..1685310 100644 --- a/Application.xaml.vb +++ b/Application.xaml.vb @@ -160,16 +160,18 @@ Class Application Friend Const LOADSELECTEDMACHINE As String = "LoadSelectedMachine" Friend Const LOADCURRENTMACHINE As String = "LoadCurrentMachine" Friend Const SAVECURRENTMACHINE As String = "SaveCurrentMachine" - + Friend Const RELOADCURRENTMACHINE As String = "ReloadCurrentMachine" ' ToolsDbPage messages Friend Const REMOVETOOL As String = "RemoveTool" Friend Const ERRORONTOOL As String = "ErrorOnTool" Friend Const SAVETOOLDRAW As String = "SaveToolDraw" + Friend Const SETFIRSTTOOLFAMILY As String = "SetFirstToolFamily" ' MachiningsDbPage messages Friend Const REMOVEMACHINING As String = "RemoveMachining" Friend Const ERRORONMACHINING As String = "ErrorOnMachining" + Friend Const SETFIRSTMACHININGFAMILY As String = "SetFirstMachiningFamily" ' TopCommandBar Friend Const NEWPROJECT As String = "NewProject" diff --git a/MachiningsDbPage/MachiningsDbViewModel.vb b/MachiningsDbPage/MachiningsDbViewModel.vb index 6bfb582..cb99778 100644 --- a/MachiningsDbPage/MachiningsDbViewModel.vb +++ b/MachiningsDbPage/MachiningsDbViewModel.vb @@ -374,6 +374,19 @@ Namespace EgtCAM5 m_MachiningsList.Clear() LoadSelectedMachineMachinings() End Sub) + Application.Msn.Register(Application.SETFIRSTMACHININGFAMILY, Sub() + For Each MachFamily In MachiningsList + For Each Machining In MachFamily.Items + Machining.IsSelected = False + Next + MachFamily.IsExpanded = False + MachFamily.IsSelected = False + Next + If MachiningsList.Count > 0 Then + MachiningsList(0).IsSelected = True + End If + End Sub) + End Sub ''' diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb index 9ddfc93..361aeef 100644 --- a/MainWindow/MainWindowViewModel.vb +++ b/MainWindow/MainWindowViewModel.vb @@ -96,17 +96,17 @@ Namespace EgtCAM5 Set(value As TabViewModel) If value IsNot m_SelectedTab Then m_SelectedTab = value - OnPropertyChanged("SelectedTab") If TypeOf value Is ProjectViewModel Then EgtSetCurrentContext(IniFile.m_ProjectSceneContext) ProjectPageSelected = True - Else + Application.Msn.NotifyColleagues(Application.SETFIRSTMACHININGFAMILY) + Application.Msn.NotifyColleagues(Application.SETFIRSTTOOLFAMILY) + EgtSetCurrentContext(IniFile.m_ProjectSceneContext) + ElseIf TypeOf value Is ToolsDbViewModel Or TypeOf value Is MachiningsDbViewModel Then + Application.Msn.NotifyColleagues(Application.RELOADCURRENTMACHINE) ProjectPageSelected = False End If - If TypeOf value Is ToolsDbViewModel Then - ' Esce dal gruppo di lavorazione corrente per poter aprire le macchine del database - EgtResetCurrMachGroup() - End If + OnPropertyChanged("SelectedTab") If TypeOf value Is MachiningsDbViewModel Then ' Esce dal gruppo di lavorazione corrente per poter aprire le macchine del database EgtSetCurrentContext(IniFile.m_ProjectSceneContext) diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb index 3d4f078..6abd232 100644 --- a/ProjectPage/ProjectViewModel.vb +++ b/ProjectPage/ProjectViewModel.vb @@ -627,7 +627,6 @@ Namespace EgtCAM5 Else 'ShowMenuMruFiles(btnOpen, New Point(0, btnOpen.Height)) End If - End Sub) Application.Msn.Register(Application.SAVEPROJECT, Sub() Dim nType As NGE = DirectCast(GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT), NGE) diff --git a/StatusBar/StatusBarViewModel.vb b/StatusBar/StatusBarViewModel.vb index bc1373a..a05a173 100644 --- a/StatusBar/StatusBarViewModel.vb +++ b/StatusBar/StatusBarViewModel.vb @@ -202,6 +202,10 @@ Namespace EgtCAM5 Application.Msn.Register(Application.SAVECURRENTMACHINE, Sub() WritePrivateProfileString(S_MACH, K_CURRMACH, SelectedMachine.Name) End Sub) + Application.Msn.Register(Application.RELOADCURRENTMACHINE, Sub() + EgtSetCurrentContext(IniFile.m_ProjectSceneContext) + EgtSetCurrMachine(SelectedMachine.Name) + End Sub) End Sub #End Region ' Constructor diff --git a/ToolsDbPage/ToolsDbViewModel.vb b/ToolsDbPage/ToolsDbViewModel.vb index 8df5c3c..265eaf0 100644 --- a/ToolsDbPage/ToolsDbViewModel.vb +++ b/ToolsDbPage/ToolsDbViewModel.vb @@ -266,6 +266,17 @@ Namespace EgtCAM5 m_ToolsList.Clear() LoadSelectedMachineTools() End Sub) + Application.Msn.Register(Application.SETFIRSTTOOLFAMILY, Sub() + For Each ToolFamily In ToolsList + For Each Tool In ToolFamily.Items + Tool.IsSelected = False + Next + ToolFamily.IsExpanded = False + ToolFamily.IsSelected = False Next + If ToolsList.Count > 0 Then + ToolsList(0).IsSelected = True + End If + End Sub) End Sub