From e2b0b25d6e0d307c154e478caad42c25dad9eabd Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 15 Sep 2022 13:26:17 +0300 Subject: MS. Performance when open RML extensions. Bug during delete tab - remove objects before save. Related Work Items: #7357 --- .../ViewModels/MainViewVM.cs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs index 458bc913a..686d95ccc 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs @@ -992,16 +992,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels YarnTypes = _active_context.YarnTypes.ToObservableCollection(); IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection(); - var machines = new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().Build(); - Machines = machines.Select(x => new MachineModel() - { - Guid = x.Guid, - Name = x.Name, - SerialNumber = x.SerialNumber, - IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty), - LastUpdated = x.LastUpdated, - HasRMLTest = false - }).ToObservableCollection(); + } @@ -1058,6 +1049,16 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels _active_context = ObservablesContext.CreateDefault(); LoadRmlProperties(); + var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildListAsync(); + Machines = machines.Select(x => new MachineModel() + { + Guid = x.Guid, + Name = x.Name, + SerialNumber = x.SerialNumber, + IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty), + LastUpdated = x.LastUpdated, + HasRMLTest = false + }).ToObservableCollection(); if (guid == null) { -- cgit v1.3.1