diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
4 files changed, 8 insertions, 8 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs index 40a407093..fdd0fed5b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs @@ -239,7 +239,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels InvalidateRelayCommands(); } - private void _frameProvider_FrameReceived(object sender, PushDiagnosticsResponse frame) + private void _frameProvider_FrameReceived(object sender, StartDiagnosticsResponse frame) { if (!_frameProvider.Disable) { @@ -358,7 +358,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels { if (_frameProvider.Disable) { - _frameProvider.PushFrame(frame.PushDiagnosticsResponse); + _frameProvider.PushFrame(frame.StartDiagnosticsResponse); CaptureDevices.First().BeginInvoke(() => { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs index 1a6fcc051..e97ffb249 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs @@ -48,7 +48,7 @@ namespace Tango.MachineStudio.Logging.Parsing var entries = Regex.Split(rest, @"\[(.*?)\]"); - EmbeddedLogItem item = new EmbeddedLogItem(new PMR.Debugging.DebugLogResponse() + EmbeddedLogItem item = new EmbeddedLogItem(new PMR.Debugging.StartDebugLogResponse() { Category = (PMR.Debugging.DebugLogCategory)Enum.Parse(typeof(PMR.Debugging.DebugLogCategory), entries[1]), FileName = entries[3], diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index 4cc1852a6..4a8cd82a5 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -122,11 +122,11 @@ namespace Tango.MachineStudio.Technician.ViewModels set { _hideMenu = value; RaisePropertyChangedAuto(); } } - private PushDiagnosticsResponse _currentDiagnosticsResponse; + private StartDiagnosticsResponse _currentDiagnosticsResponse; /// <summary> /// Gets or sets the current diagnostics response. /// </summary> - public PushDiagnosticsResponse CurrentDiagnosticsResponse + public StartDiagnosticsResponse CurrentDiagnosticsResponse { get { return _currentDiagnosticsResponse; } set { _currentDiagnosticsResponse = value; RaisePropertyChanged(nameof(CurrentDiagnosticsResponse)); } @@ -221,7 +221,7 @@ namespace Tango.MachineStudio.Technician.ViewModels /// </summary> /// <param name="sender">The sender.</param> /// <param name="response">The response.</param> - private void DiagnosticsFrameProvider_FrameReceived(object sender, PushDiagnosticsResponse response) + private void DiagnosticsFrameProvider_FrameReceived(object sender, StartDiagnosticsResponse response) { PopulateDiagnosticsData(response); } @@ -234,7 +234,7 @@ namespace Tango.MachineStudio.Technician.ViewModels /// Populates the diagnostics data to the proper elements. /// </summary> /// <param name="data">The data.</param> - private void PopulateDiagnosticsData(PushDiagnosticsResponse data) + private void PopulateDiagnosticsData(StartDiagnosticsResponse data) { if (DateTime.Now > _lastDiagnosticsResponseUpdate.AddMilliseconds(MIN_DIAGNOSTICS_UPDATE_MILI)) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs index f3f7642df..403a6d510 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs @@ -127,7 +127,7 @@ namespace Tango.MachineStudio.Technician.ViewModels /// </summary> /// <param name="sender">The sender.</param> /// <param name="data">The data.</param> - private void MachineOperator_DiagnosticsDataAvailable(object sender, PushDiagnosticsResponse data) + private void MachineOperator_DiagnosticsDataAvailable(object sender, StartDiagnosticsResponse data) { //TemperatureController.PushData(data.Temperature.ToArray()); //PressureController.PushData(data.Temperature.ToArray()); |