aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2022-08-31 12:02:47 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2022-08-31 12:02:47 +0300
commit13e76d80896d61c476ff755a892c795ed4af6de6 (patch)
tree6f03b49624fe2c52ae2a129e1df086c232aa9d7d /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
parent6e4ddaeef2667e071f7f079876e98bd77ed233f3 (diff)
downloadTango-13e76d80896d61c476ff755a892c795ed4af6de6.tar.gz
Tango-13e76d80896d61c476ff755a892c795ed4af6de6.zip
MS. RML Extension. Added Application Type,
Yarn Type and Tension Error to Test results table. Changes in database. Related Work Items: #6347
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.cs13
1 files changed, 7 insertions, 6 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 d6f3ea418..b2f3d99cf 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 async void LoadRmlProperties()
+ private void LoadRmlProperties()
{
Applications = _active_context.YarnApplications.ToObservableCollection();
Brands = _active_context.YarnBrands.ToObservableCollection();
@@ -992,7 +992,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
YarnTypes = _active_context.YarnTypes.ToObservableCollection();
IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection();
- var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildAsync();
+ var machines = new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().Build();
Machines = machines.Select(x => new MachineModel()
{
Guid = x.Guid,
@@ -1067,12 +1067,13 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
guid = rml_extention.Guid;
}
- ActiveRMLExtension = await new RmlExtensionsBuilder(_active_context)
- .Set(guid)
- .WithUser()
- .BuildAsync();
+
ActiveRML = new RmlBuilder(_active_context).Set(SelectedRMLExtension.RMLGuid).WithLiquidFactors().Build();
+
+ ActiveRMLExtension = new RmlExtensionsBuilder(_active_context)
+ .Set(guid)
+ .Build();
if (!String.IsNullOrEmpty(ActiveRML.Manufacturer) && false == Manufacturers.Any(x => x == ActiveRML.Manufacturer))
{