diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
3 files changed, 1 insertions, 51 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Diagnostics/DefaultDiagnosticsFrameProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Diagnostics/DefaultDiagnosticsFrameProvider.cs index 8f1076bb8..63612d420 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Diagnostics/DefaultDiagnosticsFrameProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Diagnostics/DefaultDiagnosticsFrameProvider.cs @@ -34,25 +34,6 @@ namespace Tango.MachineStudio.Common.Diagnostics set { _disable = value; - - if (!_disable) - { - if (_application.ConnectedMachine != null) - { - MachineEventsStateProvider = _application.ConnectedMachine.MachineEventsStateProvider; - } - else - { - MachineEventsStateProvider = new DefaultMachineEventsStateProvider(); - } - } - else - { - if (_application.ConnectedMachine != null) - { - MachineEventsStateProvider = new DefaultMachineEventsStateProvider(); - } - } } } @@ -61,21 +42,6 @@ namespace Tango.MachineStudio.Common.Diagnostics /// </summary> public event EventHandler<PushDiagnosticsResponse> FrameReceived; - private IMachineEventsStateProvider _machineEventsStateProvider; - /// <summary> - /// Gets or sets the machine events state provider used to get notifications about current machine events and errors. - /// </summary> - public IMachineEventsStateProvider MachineEventsStateProvider - { - get { return _machineEventsStateProvider; } - set - { - _machineEventsStateProvider = value; - RaisePropertyChangedAuto(); - MachineEventsStateProviderChanged?.Invoke(this, _machineEventsStateProvider); - } - } - /// <summary> /// Initializes a new instance of the <see cref="DefaultDiagnosticsFrameProvider"/> class. /// </summary> @@ -83,7 +49,6 @@ namespace Tango.MachineStudio.Common.Diagnostics public DefaultDiagnosticsFrameProvider(IStudioApplicationManager applicationManager) { _application = applicationManager; - MachineEventsStateProvider = new DefaultMachineEventsStateProvider(); applicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged; } @@ -97,11 +62,6 @@ namespace Tango.MachineStudio.Common.Diagnostics if (machine != null) { machine.DiagnosticsDataAvailable += DefaultDiagnosticsFrameProvider_DiagnosticsDataAvailable; - - if (!Disable) - { - MachineEventsStateProvider = machine.MachineEventsStateProvider; - } } } @@ -127,7 +87,6 @@ namespace Tango.MachineStudio.Common.Diagnostics if (Disable) { OnFrameReceived(frame); - MachineEventsStateProvider.ApplyEvents(frame.Events); } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Diagnostics/IDiagnosticsFrameProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Diagnostics/IDiagnosticsFrameProvider.cs index ab4780a1f..3294b341d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Diagnostics/IDiagnosticsFrameProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Diagnostics/IDiagnosticsFrameProvider.cs @@ -19,16 +19,6 @@ namespace Tango.MachineStudio.Common.Diagnostics event EventHandler<PushDiagnosticsResponse> FrameReceived; /// <summary> - /// Occurs when the machine events state provider has changed. - /// </summary> - event EventHandler<IMachineEventsStateProvider> MachineEventsStateProviderChanged; - - /// <summary> - /// Gets or sets the machine events state provider used to get notifications about current machine events and errors. - /// </summary> - IMachineEventsStateProvider MachineEventsStateProvider { get; } - - /// <summary> /// Disables the frame delivery from the current connected machine and enables the manual push frame method. /// </summary> bool Disable { get; set; } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs index d3fb0897f..91aa049e9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs @@ -220,6 +220,7 @@ namespace Tango.MachineStudio.Common.EventLogging machineEvent.DateTime = DateTime.UtcNow; machineEvent.Description = message; machineEvent.EventType = _eventTypesGuids[eventType]; + machineEvent.EventTypeGuid = machineEvent.EventType.Guid; Log(machineEvent); } |