diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-08-07 09:11:33 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-08-07 09:11:33 +0300 |
| commit | 6e4ddaeef2667e071f7f079876e98bd77ed233f3 (patch) | |
| tree | 2b7b08bd6f5b8ef83bd1b9e679813a69575dcae4 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs | |
| parent | 516ee0b585d84bda4fcc3c31aa44d1e3b7da5e93 (diff) | |
| download | Tango-6e4ddaeef2667e071f7f079876e98bd77ed233f3.tar.gz Tango-6e4ddaeef2667e071f7f079876e98bd77ed233f3.zip | |
MS . RML Extension
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs | 6 |
1 files changed, 4 insertions, 2 deletions
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 820a55558..d6f3ea418 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 @@ -973,7 +973,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } } - private void LoadRmlProperties() + private async void LoadRmlProperties() { Applications = _active_context.YarnApplications.ToObservableCollection(); Brands = _active_context.YarnBrands.ToObservableCollection(); @@ -991,7 +991,9 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels Texturing = _active_context.YarnTexturings.ToObservableCollection(); YarnTypes = _active_context.YarnTypes.ToObservableCollection(); IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection(); - Machines = ObservablesStaticCollections.Instance.Machines.Select(x => new MachineModel() + + var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildAsync(); + Machines = machines.Select(x => new MachineModel() { Guid = x.Guid, Name = x.Name, |