From 79be5ab4903b98e2960913d7b07ec49d14410b27 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 27 Sep 2018 17:59:51 +0300 Subject: Working on RML module. Fixed issue with CSV trying to add rows after dispose was called. --- .../Tango.MachineStudio.RML.csproj | 14 +++++++++++ .../ViewModels/MainViewVM.cs | 14 ++++++----- .../Tango.MachineStudio.RML/Views/RmlView.xaml | 14 +++++++++++ .../Tango.MachineStudio.RML/Views/RmlView.xaml.cs | 28 ++++++++++++++++++++++ .../Tango.MachineStudio.RML/Views/RmlsView.xaml | 14 +++++++++++ .../Tango.MachineStudio.RML/Views/RmlsView.xaml.cs | 28 ++++++++++++++++++++++ .../ViewModels/MachineTechViewVM.cs | 17 +++++++------ 7 files changed, 116 insertions(+), 13 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj index d9e0d5cf1..fcd933f4b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj @@ -85,6 +85,12 @@ MainView.xaml + + RmlsView.xaml + + + RmlView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -138,6 +144,14 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs index ff42d870c..9e108d0a8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs @@ -50,12 +50,15 @@ namespace Tango.MachineStudio.RML.ViewModels LoadRmls(); } - private void LoadRmls() + private async void LoadRmls() { - using (_rmls_context = ObservablesContext.CreateDefault()) - { - Rmls = _rmls.ToList().ToObservableCollection(); - } + //using (_rmls_context = ObservablesContext.CreateDefault()) + //{ + // await Task.Factory.StartNew(() => + // { + // Rmls = _rmls.ToList().ToObservableCollection(); + // }); + //} } private void OnSelectedRmlChanged() @@ -89,7 +92,6 @@ namespace Tango.MachineStudio.RML.ViewModels ActiveRML = await new RmlBuilder(_active_context) .Set(guid) .WithAllParametersGroup() - .WithCCT() .WithLiquidFactors() .BuildAsync(); } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml new file mode 100644 index 000000000..92b8506f5 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml @@ -0,0 +1,14 @@ + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml.cs new file mode 100644 index 000000000..e01654243 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.MachineStudio.RML.Views +{ + /// + /// Interaction logic for RmlView.xaml + /// + public partial class RmlView : UserControl + { + public RmlView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml new file mode 100644 index 000000000..2ba5e44c9 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml @@ -0,0 +1,14 @@ + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml.cs new file mode 100644 index 000000000..66f52d8c8 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.MachineStudio.RML.Views +{ + /// + /// Interaction logic for RmlsView.xaml + /// + public partial class RmlsView : UserControl + { + public RmlsView() + { + InitializeComponent(); + } + } +} 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 9051b5fa9..2ca5aa43b 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 @@ -383,25 +383,28 @@ namespace Tango.MachineStudio.Technician.ViewModels CurrentDiagnosticsResponseSize = data.CalculateSize(); } - foreach (var sr in _single_monitors_recordings) { - var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == (sr.Tag as TechMonitor).Name); + var techMonitor = (sr.Tag as TechMonitor); + + var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == techMonitor.Name); if (prop != null) { - var points = GetDataArray((sr.Tag as TechMonitor), prop.GetValue(data.Monitors)); + var points = GetDataArray(techMonitor, prop.GetValue(data.Monitors)); sr.PushData(points); } } foreach (var mr in _multi_monitors_recordings) { - var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == (mr.Tag as TechMonitor).Name); + var techMonitor = (mr.Tag as TechMonitor); + + var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == techMonitor.Name); if (prop != null) { - var points = GetDataMatrix((mr.Tag as TechMonitor), prop.GetValue(data.Monitors)); + var points = GetDataMatrix(techMonitor, prop.GetValue(data.Monitors)); mr.PushData(points); } } @@ -1035,11 +1038,11 @@ namespace Tango.MachineStudio.Technician.ViewModels { if (!monitor.MultiChannel) { - _single_monitors_recordings.Add(new SingleTechRecordingData(monitor.Name, dlg.FileName + "\\" + monitor.Name + ".csv") { Tag = monitor }); + _single_monitors_recordings.Add(new SingleTechRecordingData(monitor.Name, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor }); } else { - _multi_monitors_recordings.Add(new MultiTechRecordingData(monitor.Name, monitor.ChannelCount, dlg.FileName + "\\" + monitor.Name + ".csv") { Tag = monitor }); + _multi_monitors_recordings.Add(new MultiTechRecordingData(monitor.Name, monitor.ChannelCount, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor }); } item.StartRecording(); } -- cgit v1.3.1