diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | 125 |
1 files changed, 69 insertions, 56 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index f9bffae29..f78cc15be 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -384,70 +384,42 @@ namespace Tango.MachineStudio.UI.ViewModels /// </summary> private void ConnectToMachine() { - _notificationProvider.ShowModalDialog<MachineConnectionViewVM>(async (x) => + if (ApplicationManager.ConnectedMachine == null) { - if (x.SelectedMachine != null) + _notificationProvider.ShowModalDialog<MachineConnectionViewVM>(async (x) => { - if (ApplicationManager.IsMachineConnected) + if (x.SelectedMachine != null) { - using (_notificationProvider.PushTaskItem("Disconnecting...")) + if (ApplicationManager.IsMachineConnected) { - await ApplicationManager.ConnectedMachine.Disconnect(); - await Task.Delay(1000); - } - } - - if (x.SelectedMachine.RequiresAuthentication) - { - _notificationProvider.ShowModalDialog<MachineLoginViewVM>(async (login) => - { - using (NotificationProvider.PushTaskItem("Connecting to machine " + x.SelectedMachine.ToString() + "...")) + using (_notificationProvider.PushTaskItem("Disconnecting...")) { - try - { - await x.SelectedMachine.Connect(); - - var authenticated = await x.SelectedMachine.As<IExternalBridgeSecureClient>().Authenticate(login.Password); - if (!authenticated) - { - _notificationProvider.ShowError("It seems like you are not authorized to access the selected machine."); - } - else - { - ApplicationManager.ConnectedMachine = x.SelectedMachine; - PostMessage(new MachineConnectionChangedMessage() { Machine = x.SelectedMachine }); - _eventLogger.Log(String.Format("Successfully connected to machine {0} via TCP", x.SelectedMachine.SerialNumber)); - } - } - catch (Exception ex) - { - LogManager.Log(ex); - _eventLogger.Log(ex, "Error connecting to machine " + x.SelectedMachine.SerialNumber); - _notificationProvider.ShowError(ex.Message); - } - - InvalidateRelayCommands(); + await ApplicationManager.ConnectedMachine.Disconnect(); + await Task.Delay(1000); } - }); - } - else - { - _notificationProvider.ShowModalDialog<MachineSerialViewVM>(async (vm) => + } + + if (x.SelectedMachine.RequiresAuthentication) { - if (vm.SelectedMachine != null) + _notificationProvider.ShowModalDialog<MachineLoginViewVM>(async (login) => { - using (NotificationProvider.PushTaskItem("Connecting to " + x.SelectedMachine.ToString() + "...")) + using (NotificationProvider.PushTaskItem("Connecting to machine " + x.SelectedMachine.ToString() + "...")) { try { await x.SelectedMachine.Connect(); - x.SelectedMachine.SerialNumber = vm.SelectedMachine.SerialNumber; - ApplicationManager.ConnectedMachine = x.SelectedMachine; - PostMessage(new MachineConnectionChangedMessage() { Machine = x.SelectedMachine }); - _eventLogger.Log(String.Format("Successfully connected to machine {0} via USB", x.SelectedMachine.SerialNumber)); - SettingsManager.Default.MachineStudio.LastVirtualMachineSerialNumber = vm.SelectedMachine.SerialNumber; - SettingsManager.SaveDefaultSettings(); + var authenticated = await x.SelectedMachine.As<IExternalBridgeSecureClient>().Authenticate(login.Password); + if (!authenticated) + { + _notificationProvider.ShowError("It seems like you are not authorized to access the selected machine."); + } + else + { + ApplicationManager.ConnectedMachine = x.SelectedMachine; + PostMessage(new MachineConnectionChangedMessage() { Machine = x.SelectedMachine }); + _eventLogger.Log(String.Format("Successfully connected to machine {0} via TCP", x.SelectedMachine.SerialNumber)); + } } catch (Exception ex) { @@ -458,15 +430,55 @@ namespace Tango.MachineStudio.UI.ViewModels InvalidateRelayCommands(); } - } - }); + }); + } + else + { + _notificationProvider.ShowModalDialog<MachineSerialViewVM>(async (vm) => + { + if (vm.SelectedMachine != null) + { + using (NotificationProvider.PushTaskItem("Connecting to " + x.SelectedMachine.ToString() + "...")) + { + try + { + await x.SelectedMachine.Connect(); + x.SelectedMachine.SerialNumber = vm.SelectedMachine.SerialNumber; + ApplicationManager.ConnectedMachine = x.SelectedMachine; + + PostMessage(new MachineConnectionChangedMessage() { Machine = x.SelectedMachine }); + _eventLogger.Log(String.Format("Successfully connected to machine {0} via USB", x.SelectedMachine.SerialNumber)); + SettingsManager.Default.MachineStudio.LastVirtualMachineSerialNumber = vm.SelectedMachine.SerialNumber; + SettingsManager.SaveDefaultSettings(); + } + catch (Exception ex) + { + LogManager.Log(ex); + _eventLogger.Log(ex, "Error connecting to machine " + x.SelectedMachine.SerialNumber); + _notificationProvider.ShowError(ex.Message); + } + + InvalidateRelayCommands(); + } + } + }); + } + + InvalidateRelayCommands(); } InvalidateRelayCommands(); - } + }); + } + else + { + _notificationProvider.ShowModalDialog<ConnectedMachineViewVM>((x) => + { + DisconnectFromMachine(); + }); + } - InvalidateRelayCommands(); - }); + InvalidateRelayCommands(); } /// <summary> @@ -581,6 +593,7 @@ namespace Tango.MachineStudio.UI.ViewModels { if (ApplicationManager.ConnectedMachine != null && machineEvent.EventType.Resolvable) { + _eventLogger.Log(String.Format("Event '{0}' resolved by user.", machineEvent.EventType.Name)); await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type); } } |