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/ViewModels/MainViewVM.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs') 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(); } -- cgit v1.3.1