diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-09-27 17:59:51 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-09-27 17:59:51 +0300 |
| commit | 79be5ab4903b98e2960913d7b07ec49d14410b27 (patch) | |
| tree | c712fd78306851abb56a979718d4ae79bbb487a7 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs | |
| parent | 5c07f82c9690ca53928a9489eba7bb88f1352f8d (diff) | |
| download | Tango-79be5ab4903b98e2960913d7b07ec49d14410b27.tar.gz Tango-79be5ab4903b98e2960913d7b07ec49d14410b27.zip | |
Working on RML module.
Fixed issue with CSV trying to add rows after dispose was called.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs | 14 |
1 files changed, 8 insertions, 6 deletions
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(); } |