From d208f2029740f203ce79c6452432fa083a4c5c07 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 4 Jul 2022 20:08:15 +0300 Subject: RML Extension. New filter to show machines where test were added. Related Work Items: #6803 --- .../Models/MachineModel.cs | 11 +++ .../ViewModels/MainViewVM.cs | 86 +++++++++++++++++++--- .../Views/MachineTestResultsView.xaml | 8 +- 3 files changed, 92 insertions(+), 13 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/MachineModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/MachineModel.cs index c2b00fe92..bac5f62b8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/MachineModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/MachineModel.cs @@ -26,6 +26,17 @@ namespace Tango.MachineStudio.ThreadExtensions.Models } } + private DateTime _lastUpdated; + /// + /// Gets or sets the entity last updated data and time. + /// + public DateTime LastUpdated + { + get { return _lastUpdated; } + set { _lastUpdated = value; + RaisePropertyChanged(nameof(LastUpdated)); } + } + private bool _hasRMLTest; public bool HasRMLTest 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 164d37b74..820a55558 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 @@ -303,11 +303,66 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels set { - _machines = value; RaisePropertyChanged(nameof(Machines)); + _machines = value; + LoadFilteredMachines(); + RaisePropertyChanged(nameof(Machines)); } } + private ObservableCollection _filteremachines; + /// + /// Gets or sets the Machines. + /// + public ObservableCollection FilteredMachines + { + get + { + return _filteremachines; + } + + set + { + _filteremachines = value; RaisePropertyChanged(nameof(FilteredMachines)); + } + + } + + private bool _showWithData; + /// + /// Gets or sets the bool show with data only. + /// + public bool ShowWithData + { + get { return _showWithData; } + set { + if(_showWithData != value) + { + _showWithData = value; + RaisePropertyChangedAuto(); + LoadFilteredMachines(); + } + } + } + + private void LoadFilteredMachines() + { + if(_showWithData) + FilteredMachines = Machines.Where(x => x.HasRMLTest).OrderBy(x => x.LastUpdated).ToObservableCollection(); + else + { + FilteredMachines = Machines.OrderBy(x=>x.Name).ToObservableCollection(); + } + + } + + private bool _canEdit; + public bool CanEdit + { + get { return _canEdit; } + set { _canEdit = value; + RaisePropertyChangedAuto(); } + } //private MachineTestResultsTabs PreviosSelectedTab { get; set; } //private MachineTestResultsTabs _selectedTab; @@ -792,19 +847,14 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels #endregion - private bool _canEdit; - public bool CanEdit - { - get { return _canEdit; } - set { _canEdit = value; - RaisePropertyChangedAuto(); } - } + public MainViewVM(INotificationProvider notificationProvider, IAuthenticationProvider authentication, IActionLogManager actionLogManager) { _notification = notificationProvider; _authentication = authentication; _actionLogManager = actionLogManager; + _showWithData = false; BackToThreadExtensionViewsCommand = new RelayCommand(BackToThreadExtensionViews, () => IsFree); SaveCommand = new RelayCommand(Save, () => IsFree); @@ -853,7 +903,6 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels AddGlossLevelItemCommand = new RelayCommand(AddGlossLevelItem); EditGlossLevelItemCommand = new RelayCommand(EditGlossLevelItem); - } @@ -947,7 +996,9 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels Guid = x.Guid, Name = x.Name, SerialNumber = x.SerialNumber, - IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty) + IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty), + LastUpdated = x.LastUpdated, + HasRMLTest = false }).ToObservableCollection(); } @@ -1028,6 +1079,17 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels Manufacturers.Add(ActiveRML.Manufacturer); } + //var colorProcessParameters = _active_context.ColorProcessParameters.Where(x => x.RmlsExtensionsGuid == guid).Select(x=>x.MachineGuid).ToList(); + //var TestResultsCollection = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(guid).BuildAsync(); + //var test1 = TestResultsCollection.Select(x => x.MachineGuid).ToList(); + //var ColorCalibration = await new RMLExtensionColorCalibrationBuilder(_active_context).SetAll().ForRMLExtension(guid).WithTests().BuildAsync(); + //var test12 = ColorCalibration.Where(x=>x.RmlExtensionColorCalibrationsTests!= null && x.RmlExtensionColorCalibrationsTests.Count() > 0).Select(x => x.MachineGuid).ToList(); + //var testResults = await new RMLExtensionColorShadeBuilder(_active_context).SetAll().ForRMLExtension(guid).WithTests().BuildAsync(); + //var test13 = testResults.Where(x => x.RmlExtensionColorShadesTests != null && x.RmlExtensionColorShadesTests.Count() > 0).Select(x => x.MachineGuid).ToList(); + + //var ulist = colorProcessParameters.Union(test1).Union(test12).Union(test13).ToList(); + + var machineIdsHasTest = (from c in _active_context.ColorProcessParameters.Where(x => x.RmlsExtensionsGuid == guid) select new { MichineGUID = c.MachineGuid }). Union(from p in _active_context.RmlExtensionTestResults.Where(x => x.RmlsExtensionsGuid == guid) @@ -1035,9 +1097,11 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels if (machineIdsHasTest.Count > 0) { + ShowWithData = true; var MachineGuid = machineIdsHasTest.First().MichineGUID; Machines.Where(x => machineIdsHasTest.Any(y => y.MichineGUID == x.Guid)).ToList().ForEach(x => x.HasRMLTest = true); - SelectedMachine = Machines.First(x => x.Guid == MachineGuid); + LoadFilteredMachines(); + SelectedMachine = FilteredMachines.First(); } else { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml index 820c68715..4a0839164 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml @@ -24,9 +24,13 @@ - TARGET MACHINE + + TARGET MACHINE + Show machines with data only + - + + -- cgit v1.3.1 From c4e8c98689dcedf035484cd079eac8d9678286db Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 24 Jul 2022 16:45:32 +0300 Subject: Added Washing test results tables Related Work Items: #6660 --- .../ViewModels/TestResultsViewVM.cs | 35 +- .../Views/TestResultsView.xaml | 316 +++--- .../RMLExtensionTestResultsCollectionBuilder.cs | 16 + .../DTO/RmlExtensionTestWashingResultDTO.cs | 14 + .../DTO/RmlExtensionTestWashingResultDTOBase.cs | 57 ++ .../Tango.BL/DTO/WashingTestMaterialDTO.cs | 14 + .../Tango.BL/DTO/WashingTestMaterialDTOBase.cs | 33 + .../Entities/RmlExtensionTestResultBase.cs | 62 +- .../Entities/RmlExtensionTestWashingResult.cs | 16 + .../Entities/RmlExtensionTestWashingResultBase.cs | 251 +++++ .../Tango.BL/Entities/WashingTestMaterial.cs | 12 + .../Tango.BL/Entities/WashingTestMaterialBase.cs | 114 +++ .../Visual_Studio/Tango.BL/ObservablesContext.cs | 132 +-- .../ObservablesEntitiesAdapterExtension.cs | 818 ++++++++------- .../ObservablesStaticCollectionsExtension.cs | 818 ++++++++------- Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 10 +- ...TENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs | 2 +- .../DB/RML_EXTENSION_TEST_RESULTS.cs | 5 +- .../DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs | 28 + .../Tango.DAL.Remote/DB/RemoteADO.Context.cs | 18 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx | 1039 +++++++++++--------- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 167 ++-- .../Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs | 31 + .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 8 +- 24 files changed, 2548 insertions(+), 1468 deletions(-) create mode 100644 Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs index 8a75c526f..cc1bba0e7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs @@ -34,6 +34,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels public event EventHandler SaveTestResults; #region Properties + + public List WashingTestMaterials { get; set; } + + private SynchronizedObservableCollection _selectedTestResults; public SynchronizedObservableCollection SelectedTestResults @@ -269,15 +273,21 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } _active_context = ObservablesContext.CreateDefault(); ResultTabs.Clear(); - LogManager.Log("Loading selected test results..."); + + if(WashingTestMaterials == null) + WashingTestMaterials = _active_context.WashingTestMaterials.ToList(); + + LogManager.Log("Loading selected test results..."); using (_notification.PushTaskItem("Loading Test Results Parameters ...")) { - var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().BuildAsync(); + var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().BuildAsync(); SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection(); foreach (var result in SelectedTestResults) { - ResultTabs.Add(new TestResultViewVM(_notification, _actionLogManager) { TestResult = result, ThreadName = ThreadName }); + var testResultViewVM = new TestResultViewVM(_notification, _actionLogManager) { TestResult = result, ThreadName = ThreadName }; + CreateWashingResult(testResultViewVM); + ResultTabs.Add(testResultViewVM); if (result.ResultIndex == 1) { SelectedTab = ResultTabs[ResultTabs.Count - 1]; @@ -324,9 +334,28 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels tensileresults.Add(new TensileResult() { RmlExtensionTestResultsGuid = newtab.TestResult.Guid, TestResultColor = TestResultColors.WHITE, ColorPercent = null }); newtab.TestResult.TensileResults = tensileresults; + CreateWashingResult(newtab); + return newtab; } + private void CreateWashingResult(TestResultViewVM testresultViewVM) + { + if(testresultViewVM.TestResult.RmlExtensionTestWashingResults != null) + return; + + var whashingresults = new SynchronizedObservableCollection(); + foreach (var material in WashingTestMaterials) + { + foreach (WashingResultColor color in Enum.GetValues(typeof(WashingResultColor))) + { + whashingresults.Add(new RmlExtensionTestWashingResult() { RmlExtensionTestResultsGuid = testresultViewVM.TestResult.Guid, WashingTestMaterialsGuid = material.Guid, Color = (int)color }); + } + } + testresultViewVM.TestResult.RmlExtensionTestWashingResults = whashingresults; + + } + #endregion #region Save diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index f6262b52d..0aceebc9a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -255,57 +255,148 @@ - - - - - - - - - - + + + + + + - - - - Process Parameters - + + + + Process Parameters + - - - Dryer temperature - - - - - - Tunnel temperature - - - - - - Tunnel flow - - - - - - Tunnel AVG temperature - - - - - - - - - Rubbing results - - + + + Dryer temperature + + + + + + Tunnel temperature + + + + + + Tunnel flow + + + + + + Tunnel AVG temperature + + + + + + + + + + Rubbing results + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Uniformity + + + + Uniformity + + + Severity + + + Zone 1 + + + + + - + + + + + Zone 2 + + + + + - + + + + + + + + Washing results + - + - - + + - - + + + + + + + + + - + - + - - - + + + + + + + + + + @@ -360,29 +464,49 @@ + + + + + + + + + + + + + + + + + + + + Tension through the thread path Tension in Zone - + - Tensiometer (gr) - + Tensiometer (gr) + Tension in Zone - + MS - + - Head - + Head + @@ -392,7 +516,7 @@ BTSR - + @@ -402,7 +526,7 @@ After dryer - + @@ -412,7 +536,7 @@ Puller tension - + @@ -422,7 +546,7 @@ Winder - + @@ -441,7 +565,7 @@ - + Mechanical properties @@ -499,9 +623,9 @@ - + - + @@ -515,45 +639,12 @@ - + - - Uniformity - - - - Uniformity - - - Severity - - - Zone 1 - - - - - - - - - - - Zone 2 - - - - - - - - - - - - COF @@ -599,12 +690,13 @@ - + - + + - - + + diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs index 2b962d56b..19c027976 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs @@ -64,5 +64,21 @@ namespace Tango.BL.Builders } }); } + + public virtual RMLExtensionTestResultsCollectionBuilder WithWashingTestResults() + { + return AddStep(4, () => + { + foreach (var result in Entities.ToList()) + { + var tests = Context.RmlExtensionTestWashingResults.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).ToList(); + foreach( var test in tests) + { + test.WashingTestMaterials = Context.WashingTestMaterials.FirstOrDefault(x => x.Guid == test.WashingTestMaterialsGuid); + } + + } + }); + } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs new file mode 100644 index 000000000..1e15767c8 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class RmlExtensionTestWashingResultDTO : RmlExtensionTestWashingResultDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs new file mode 100644 index 000000000..9f98d4aa9 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs @@ -0,0 +1,57 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class RmlExtensionTestWashingResultDTOBase : ObservableEntityDTO + { + + /// + /// rml extension test results guid + /// + public String RmlExtensionTestResultsGuid + { + get; set; + } + + /// + /// washing test materials guid + /// + public String WashingTestMaterialsGuid + { + get; set; + } + + /// + /// color + /// + public Int32 Color + { + get; set; + } + + /// + /// washing value + /// + public Nullable WashingValue + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs new file mode 100644 index 000000000..f2c9ec25d --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class WashingTestMaterialDTO : WashingTestMaterialDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs new file mode 100644 index 000000000..8c9bc0ff1 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs @@ -0,0 +1,33 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class WashingTestMaterialDTOBase : ObservableEntityDTO + { + + /// + /// name + /// + public String Name + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs index 7f6804039..c53b14327 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs @@ -91,9 +91,11 @@ namespace Tango.BL.Entities public event EventHandler> TensileResultsChanged; + public event EventHandler> RmlExtensionTestResultsFilesChanged; + public event EventHandler MachineChanged; - public event EventHandler> RmlExtensionTestResultsFilesChanged; + public event EventHandler> RmlExtensionTestWashingResultsChanged; public event EventHandler> RubbingResultsChanged; @@ -1016,6 +1018,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection _rmlextensiontestresultsfiles; + + /// + /// Gets or sets the rmlextensiontestresultbase rml extension test results files. + /// + + public virtual SynchronizedObservableCollection RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + if (_rmlextensiontestresultsfiles != value) + { + _rmlextensiontestresultsfiles = value; + + OnRmlExtensionTestResultsFilesChanged(value); + + } + } + } + protected Machine _machine; /// @@ -1048,26 +1075,26 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection _rmlextensiontestresultsfiles; + protected SynchronizedObservableCollection _rmlextensiontestwashingresults; /// - /// Gets or sets the rmlextensiontestresultbase rml extension test results files. + /// Gets or sets the rmlextensiontestresultbase rml extension test washing results. /// - public virtual SynchronizedObservableCollection RmlExtensionTestResultsFiles + public virtual SynchronizedObservableCollection RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - if (_rmlextensiontestresultsfiles != value) + if (_rmlextensiontestwashingresults != value) { - _rmlextensiontestresultsfiles = value; + _rmlextensiontestwashingresults = value; - OnRmlExtensionTestResultsFilesChanged(value); + OnRmlExtensionTestWashingResultsChanged(value); } } @@ -1386,6 +1413,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(TensileResults)); } + /// + /// Called when the RmlExtensionTestResultsFiles has changed. + /// + protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection rmlextensiontestresultsfiles) + { + RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles); + RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + /// /// Called when the Machine has changed. /// @@ -1396,12 +1432,12 @@ namespace Tango.BL.Entities } /// - /// Called when the RmlExtensionTestResultsFiles has changed. + /// Called when the RmlExtensionTestWashingResults has changed. /// - protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection rmlextensiontestresultsfiles) + protected virtual void OnRmlExtensionTestWashingResultsChanged(SynchronizedObservableCollection rmlextensiontestwashingresults) { - RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles); - RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + RmlExtensionTestWashingResultsChanged?.Invoke(this, rmlextensiontestwashingresults); + RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } /// @@ -1423,6 +1459,8 @@ namespace Tango.BL.Entities RmlExtensionTestResultsFiles = new SynchronizedObservableCollection(); + RmlExtensionTestWashingResults = new SynchronizedObservableCollection(); + RubbingResults = new SynchronizedObservableCollection(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs new file mode 100644 index 000000000..af8858e64 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Entities +{ + public class RmlExtensionTestWashingResult: RmlExtensionTestWashingResultBase + { + public RmlExtensionTestWashingResult(): base() + { + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs new file mode 100644 index 000000000..0927baa04 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs @@ -0,0 +1,251 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("RML_EXTENSION_TEST_WASHING_RESULTS")] + public abstract class RmlExtensionTestWashingResultBase : ObservableEntity + { + + public event EventHandler ColorChanged; + + public event EventHandler> WashingValueChanged; + + public event EventHandler RmlExtensionTestResultsChanged; + + public event EventHandler WashingTestMaterialsChanged; + + protected String _rmlextensiontestresultsguid; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase rml extension test results guid. + /// + + [Column("RML_EXTENSION_TEST_RESULTS_GUID")] + [ForeignKey("RmlExtensionTestResults")] + + public String RmlExtensionTestResultsGuid + { + get + { + return _rmlextensiontestresultsguid; + } + + set + { + if (_rmlextensiontestresultsguid != value) + { + _rmlextensiontestresultsguid = value; + + } + } + } + + protected String _washingtestmaterialsguid; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase washing test materials guid. + /// + + [Column("WASHING_TEST_MATERIALS_GUID")] + [ForeignKey("WashingTestMaterials")] + + public String WashingTestMaterialsGuid + { + get + { + return _washingtestmaterialsguid; + } + + set + { + if (_washingtestmaterialsguid != value) + { + _washingtestmaterialsguid = value; + + } + } + } + + protected Int32 _color; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase color. + /// + + [Column("COLOR")] + + public Int32 Color + { + get + { + return _color; + } + + set + { + if (_color != value) + { + _color = value; + + OnColorChanged(value); + + } + } + } + + protected Nullable _washingvalue; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase washing value. + /// + + [Column("WASHING_VALUE")] + + public Nullable WashingValue + { + get + { + return _washingvalue; + } + + set + { + if (_washingvalue != value) + { + _washingvalue = value; + + OnWashingValueChanged(value); + + } + } + } + + protected RmlExtensionTestResult _rmlextensiontestresults; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase rml extension test results. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual RmlExtensionTestResult RmlExtensionTestResults + { + get + { + return _rmlextensiontestresults; + } + + set + { + if (_rmlextensiontestresults != value) + { + _rmlextensiontestresults = value; + + if (RmlExtensionTestResults != null) + { + RmlExtensionTestResultsGuid = RmlExtensionTestResults.Guid; + } + + OnRmlExtensionTestResultsChanged(value); + + } + } + } + + protected WashingTestMaterial _washingtestmaterials; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase washing test materials. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual WashingTestMaterial WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + if (_washingtestmaterials != value) + { + _washingtestmaterials = value; + + if (WashingTestMaterials != null) + { + WashingTestMaterialsGuid = WashingTestMaterials.Guid; + } + + OnWashingTestMaterialsChanged(value); + + } + } + } + + /// + /// Called when the Color has changed. + /// + protected virtual void OnColorChanged(Int32 color) + { + ColorChanged?.Invoke(this, color); + RaisePropertyChanged(nameof(Color)); + } + + /// + /// Called when the WashingValue has changed. + /// + protected virtual void OnWashingValueChanged(Nullable washingvalue) + { + WashingValueChanged?.Invoke(this, washingvalue); + RaisePropertyChanged(nameof(WashingValue)); + } + + /// + /// Called when the RmlExtensionTestResults has changed. + /// + protected virtual void OnRmlExtensionTestResultsChanged(RmlExtensionTestResult rmlextensiontestresults) + { + RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults); + RaisePropertyChanged(nameof(RmlExtensionTestResults)); + } + + /// + /// Called when the WashingTestMaterials has changed. + /// + protected virtual void OnWashingTestMaterialsChanged(WashingTestMaterial washingtestmaterials) + { + WashingTestMaterialsChanged?.Invoke(this, washingtestmaterials); + RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + /// + /// Initializes a new instance of the class. + /// + public RmlExtensionTestWashingResultBase() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs new file mode 100644 index 000000000..7cb6bd8e3 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Entities +{ + public class WashingTestMaterial: WashingTestMaterialBase + { + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs new file mode 100644 index 000000000..84271403c --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs @@ -0,0 +1,114 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("WASHING_TEST_MATERIALS")] + public abstract class WashingTestMaterialBase : ObservableEntity + { + + public event EventHandler NameChanged; + + public event EventHandler> RmlExtensionTestWashingResultsChanged; + + protected String _name; + + /// + /// Gets or sets the washingtestmaterialbase name. + /// + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + if (_name != value) + { + _name = value; + + OnNameChanged(value); + + } + } + } + + protected SynchronizedObservableCollection _rmlextensiontestwashingresults; + + /// + /// Gets or sets the washingtestmaterialbase rml extension test washing results. + /// + + public virtual SynchronizedObservableCollection RmlExtensionTestWashingResults + { + get + { + return _rmlextensiontestwashingresults; + } + + set + { + if (_rmlextensiontestwashingresults != value) + { + _rmlextensiontestwashingresults = value; + + OnRmlExtensionTestWashingResultsChanged(value); + + } + } + } + + /// + /// Called when the Name has changed. + /// + protected virtual void OnNameChanged(String name) + { + NameChanged?.Invoke(this, name); + RaisePropertyChanged(nameof(Name)); + } + + /// + /// Called when the RmlExtensionTestWashingResults has changed. + /// + protected virtual void OnRmlExtensionTestWashingResultsChanged(SynchronizedObservableCollection rmlextensiontestwashingresults) + { + RmlExtensionTestWashingResultsChanged?.Invoke(this, rmlextensiontestwashingresults); + RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); + } + + /// + /// Initializes a new instance of the class. + /// + public WashingTestMaterialBase() : base() + { + + RmlExtensionTestWashingResults = new SynchronizedObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index f62ae38bd..c06af8ba5 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -166,6 +166,70 @@ namespace Tango.BL get; set; } + /// + /// Gets or sets the RmlExtensionColorCalibrations. + /// + public DbSet RmlExtensionColorCalibrations + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// + public DbSet RmlExtensionColorCalibrationsTests + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// + public DbSet RmlExtensionColorCalibrationsTestsLiquidData + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// + public DbSet RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorShades. + /// + public DbSet RmlExtensionColorShades + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorShadesTests. + /// + public DbSet RmlExtensionColorShadesTests + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// + public DbSet RmlExtensionColorShadesTestsData + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionTestResultsFiles. + /// + public DbSet RmlExtensionTestResultsFiles + { + get; set; + } + /// /// Gets or sets the ActionLogs. /// @@ -703,65 +767,9 @@ namespace Tango.BL } /// - /// Gets or sets the RmlExtensionColorCalibrations. - /// - public DbSet RmlExtensionColorCalibrations - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorCalibrationsTests. - /// - public DbSet RmlExtensionColorCalibrationsTests - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. - /// - public DbSet RmlExtensionColorCalibrationsTestsLiquidData - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. - /// - public DbSet RmlExtensionColorCalibrationsTestsLiquidDataPoints - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorShades. - /// - public DbSet RmlExtensionColorShades - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorShadesTests. - /// - public DbSet RmlExtensionColorShadesTests - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorShadesTestsData. - /// - public DbSet RmlExtensionColorShadesTestsData - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// - public DbSet RmlExtensionTestResultsFiles + public DbSet RmlExtensionTestWashingResults { get; set; } @@ -958,6 +966,14 @@ namespace Tango.BL get; set; } + /// + /// Gets or sets the WashingTestMaterials. + /// + public DbSet WashingTestMaterials + { + get; set; + } + /// /// Gets or sets the WindingMethods. /// diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index a9d32e87d..d06377cf3 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -665,6 +665,294 @@ namespace Tango.BL } + private ObservableCollection _rmlextensioncolorcalibrations; + /// + /// Gets or sets the RmlExtensionColorCalibrations. + /// + public ObservableCollection RmlExtensionColorCalibrations + { + get + { + return _rmlextensioncolorcalibrations; + } + + set + { + _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrations View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsViewSource + { + get + { + return _rmlextensioncolorcalibrationsViewSource; + } + + set + { + _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstests; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// + public ObservableCollection RmlExtensionColorCalibrationsTests + { + get + { + return _rmlextensioncolorcalibrationstests; + } + + set + { + _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddata; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// + public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidData + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddata; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddatapoints; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// + public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapoints; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshades; + /// + /// Gets or sets the RmlExtensionColorShades. + /// + public ObservableCollection RmlExtensionColorShades + { + get + { + return _rmlextensioncolorshades; + } + + set + { + _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + } + + } + + private ICollectionView _rmlextensioncolorshadesViewSource; + /// + /// Gets or sets the RmlExtensionColorShades View Source. + /// + public ICollectionView RmlExtensionColorShadesViewSource + { + get + { + return _rmlextensioncolorshadesViewSource; + } + + set + { + _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshadestests; + /// + /// Gets or sets the RmlExtensionColorShadesTests. + /// + public ObservableCollection RmlExtensionColorShadesTests + { + get + { + return _rmlextensioncolorshadestests; + } + + set + { + _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsViewSource; + /// + /// Gets or sets the RmlExtensionColorShadesTests View Source. + /// + public ICollectionView RmlExtensionColorShadesTestsViewSource + { + get + { + return _rmlextensioncolorshadestestsViewSource; + } + + set + { + _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshadestestsdata; + /// + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// + public ObservableCollection RmlExtensionColorShadesTestsData + { + get + { + return _rmlextensioncolorshadestestsdata; + } + + set + { + _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + /// + /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + /// + public ICollectionView RmlExtensionColorShadesTestsDataViewSource + { + get + { + return _rmlextensioncolorshadestestsdataViewSource; + } + + set + { + _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + } + + } + + private ObservableCollection _rmlextensiontestresultsfiles; + /// + /// Gets or sets the RmlExtensionTestResultsFiles. + /// + public ObservableCollection RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + + } + + private ICollectionView _rmlextensiontestresultsfilesViewSource; + /// + /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// + public ICollectionView RmlExtensionTestResultsFilesViewSource + { + get + { + return _rmlextensiontestresultsfilesViewSource; + } + + set + { + _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + } + + } + private ObservableCollection _actionlogs; /// /// Gets or sets the ActionLogs. @@ -2737,630 +3025,378 @@ namespace Tango.BL private ICollectionView _mediaconditionsViewSource; /// - /// Gets or sets the MediaConditions View Source. - /// - public ICollectionView MediaConditionsViewSource - { - get - { - return _mediaconditionsViewSource; - } - - set - { - _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); - } - - } - - private ObservableCollection _mediamaterials; - /// - /// Gets or sets the MediaMaterials. - /// - public ObservableCollection MediaMaterials - { - get - { - return _mediamaterials; - } - - set - { - _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); - } - - } - - private ICollectionView _mediamaterialsViewSource; - /// - /// Gets or sets the MediaMaterials View Source. - /// - public ICollectionView MediaMaterialsViewSource - { - get - { - return _mediamaterialsViewSource; - } - - set - { - _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); - } - - } - - private ObservableCollection _mediapurposes; - /// - /// Gets or sets the MediaPurposes. - /// - public ObservableCollection MediaPurposes - { - get - { - return _mediapurposes; - } - - set - { - _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); - } - - } - - private ICollectionView _mediapurposesViewSource; - /// - /// Gets or sets the MediaPurposes View Source. - /// - public ICollectionView MediaPurposesViewSource - { - get - { - return _mediapurposesViewSource; - } - - set - { - _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); - } - - } - - private ObservableCollection _midtanktypes; - /// - /// Gets or sets the MidTankTypes. - /// - public ObservableCollection MidTankTypes - { - get - { - return _midtanktypes; - } - - set - { - _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); - } - - } - - private ICollectionView _midtanktypesViewSource; - /// - /// Gets or sets the MidTankTypes View Source. - /// - public ICollectionView MidTankTypesViewSource - { - get - { - return _midtanktypesViewSource; - } - - set - { - _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); - } - - } - - private ObservableCollection _organizations; - /// - /// Gets or sets the Organizations. - /// - public ObservableCollection Organizations - { - get - { - return _organizations; - } - - set - { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } - - } - - private ICollectionView _organizationsViewSource; - /// - /// Gets or sets the Organizations View Source. - /// - public ICollectionView OrganizationsViewSource - { - get - { - return _organizationsViewSource; - } - - set - { - _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); - } - - } - - private ObservableCollection _permissions; - /// - /// Gets or sets the Permissions. - /// - public ObservableCollection Permissions - { - get - { - return _permissions; - } - - set - { - _permissions = value; RaisePropertyChanged(nameof(Permissions)); - } - - } - - private ICollectionView _permissionsViewSource; - /// - /// Gets or sets the Permissions View Source. - /// - public ICollectionView PermissionsViewSource - { - get - { - return _permissionsViewSource; - } - - set - { - _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); - } - - } - - private ObservableCollection _processparameterstables; - /// - /// Gets or sets the ProcessParametersTables. - /// - public ObservableCollection ProcessParametersTables - { - get - { - return _processparameterstables; - } - - set - { - _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); - } - - } - - private ICollectionView _processparameterstablesViewSource; - /// - /// Gets or sets the ProcessParametersTables View Source. - /// - public ICollectionView ProcessParametersTablesViewSource - { - get - { - return _processparameterstablesViewSource; - } - - set - { - _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); - } - - } - - private ObservableCollection _processparameterstablesgroups; - /// - /// Gets or sets the ProcessParametersTablesGroups. - /// - public ObservableCollection ProcessParametersTablesGroups - { - get - { - return _processparameterstablesgroups; - } - - set - { - _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); - } - - } - - private ICollectionView _processparameterstablesgroupsViewSource; - /// - /// Gets or sets the ProcessParametersTablesGroups View Source. + /// Gets or sets the MediaConditions View Source. /// - public ICollectionView ProcessParametersTablesGroupsViewSource + public ICollectionView MediaConditionsViewSource { get { - return _processparameterstablesgroupsViewSource; + return _mediaconditionsViewSource; } set { - _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); + _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); } } - private ObservableCollection _publishedprocedureprojects; + private ObservableCollection _mediamaterials; /// - /// Gets or sets the PublishedProcedureProjects. + /// Gets or sets the MediaMaterials. /// - public ObservableCollection PublishedProcedureProjects + public ObservableCollection MediaMaterials { get { - return _publishedprocedureprojects; + return _mediamaterials; } set { - _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); + _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); } } - private ICollectionView _publishedprocedureprojectsViewSource; + private ICollectionView _mediamaterialsViewSource; /// - /// Gets or sets the PublishedProcedureProjects View Source. + /// Gets or sets the MediaMaterials View Source. /// - public ICollectionView PublishedProcedureProjectsViewSource + public ICollectionView MediaMaterialsViewSource { get { - return _publishedprocedureprojectsViewSource; + return _mediamaterialsViewSource; } set { - _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); + _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); } } - private ObservableCollection _publishedprocedureprojectsversions; + private ObservableCollection _mediapurposes; /// - /// Gets or sets the PublishedProcedureProjectsVersions. + /// Gets or sets the MediaPurposes. /// - public ObservableCollection PublishedProcedureProjectsVersions + public ObservableCollection MediaPurposes { get { - return _publishedprocedureprojectsversions; + return _mediapurposes; } set { - _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); + _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); } } - private ICollectionView _publishedprocedureprojectsversionsViewSource; + private ICollectionView _mediapurposesViewSource; /// - /// Gets or sets the PublishedProcedureProjectsVersions View Source. + /// Gets or sets the MediaPurposes View Source. /// - public ICollectionView PublishedProcedureProjectsVersionsViewSource + public ICollectionView MediaPurposesViewSource { get { - return _publishedprocedureprojectsversionsViewSource; + return _mediapurposesViewSource; } set { - _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); + _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrations; + private ObservableCollection _midtanktypes; /// - /// Gets or sets the RmlExtensionColorCalibrations. + /// Gets or sets the MidTankTypes. /// - public ObservableCollection RmlExtensionColorCalibrations + public ObservableCollection MidTankTypes { get { - return _rmlextensioncolorcalibrations; + return _midtanktypes; } set { - _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); } } - private ICollectionView _rmlextensioncolorcalibrationsViewSource; + private ICollectionView _midtanktypesViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrations View Source. + /// Gets or sets the MidTankTypes View Source. /// - public ICollectionView RmlExtensionColorCalibrationsViewSource + public ICollectionView MidTankTypesViewSource { get { - return _rmlextensioncolorcalibrationsViewSource; + return _midtanktypesViewSource; } set { - _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstests; + private ObservableCollection _organizations; /// - /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// Gets or sets the Organizations. /// - public ObservableCollection RmlExtensionColorCalibrationsTests + public ObservableCollection Organizations { get { - return _rmlextensioncolorcalibrationstests; + return _organizations; } set { - _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + _organizations = value; RaisePropertyChanged(nameof(Organizations)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + private ICollectionView _organizationsViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + /// Gets or sets the Organizations View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + public ICollectionView OrganizationsViewSource { get { - return _rmlextensioncolorcalibrationstestsViewSource; + return _organizationsViewSource; } set { - _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddata; + private ObservableCollection _permissions; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// Gets or sets the Permissions. /// - public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidData + public ObservableCollection Permissions { get { - return _rmlextensioncolorcalibrationstestsliquiddata; + return _permissions; } set { - _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + _permissions = value; RaisePropertyChanged(nameof(Permissions)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + private ICollectionView _permissionsViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + /// Gets or sets the Permissions View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + public ICollectionView PermissionsViewSource { get { - return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + return _permissionsViewSource; } set { - _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddatapoints; + private ObservableCollection _processparameterstables; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// Gets or sets the ProcessParametersTables. /// - public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidDataPoints + public ObservableCollection ProcessParametersTables { get { - return _rmlextensioncolorcalibrationstestsliquiddatapoints; + return _processparameterstables; } set { - _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + private ICollectionView _processparameterstablesViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + /// Gets or sets the ProcessParametersTables View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + public ICollectionView ProcessParametersTablesViewSource { get { - return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + return _processparameterstablesViewSource; } set { - _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); } } - private ObservableCollection _rmlextensioncolorshades; + private ObservableCollection _processparameterstablesgroups; /// - /// Gets or sets the RmlExtensionColorShades. + /// Gets or sets the ProcessParametersTablesGroups. /// - public ObservableCollection RmlExtensionColorShades + public ObservableCollection ProcessParametersTablesGroups { get { - return _rmlextensioncolorshades; + return _processparameterstablesgroups; } set { - _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); } } - private ICollectionView _rmlextensioncolorshadesViewSource; + private ICollectionView _processparameterstablesgroupsViewSource; /// - /// Gets or sets the RmlExtensionColorShades View Source. + /// Gets or sets the ProcessParametersTablesGroups View Source. /// - public ICollectionView RmlExtensionColorShadesViewSource + public ICollectionView ProcessParametersTablesGroupsViewSource { get { - return _rmlextensioncolorshadesViewSource; + return _processparameterstablesgroupsViewSource; } set { - _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); } } - private ObservableCollection _rmlextensioncolorshadestests; + private ObservableCollection _publishedprocedureprojects; /// - /// Gets or sets the RmlExtensionColorShadesTests. + /// Gets or sets the PublishedProcedureProjects. /// - public ObservableCollection RmlExtensionColorShadesTests + public ObservableCollection PublishedProcedureProjects { get { - return _rmlextensioncolorshadestests; + return _publishedprocedureprojects; } set { - _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); } } - private ICollectionView _rmlextensioncolorshadestestsViewSource; + private ICollectionView _publishedprocedureprojectsViewSource; /// - /// Gets or sets the RmlExtensionColorShadesTests View Source. + /// Gets or sets the PublishedProcedureProjects View Source. /// - public ICollectionView RmlExtensionColorShadesTestsViewSource + public ICollectionView PublishedProcedureProjectsViewSource { get { - return _rmlextensioncolorshadestestsViewSource; + return _publishedprocedureprojectsViewSource; } set { - _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); } } - private ObservableCollection _rmlextensioncolorshadestestsdata; + private ObservableCollection _publishedprocedureprojectsversions; /// - /// Gets or sets the RmlExtensionColorShadesTestsData. + /// Gets or sets the PublishedProcedureProjectsVersions. /// - public ObservableCollection RmlExtensionColorShadesTestsData + public ObservableCollection PublishedProcedureProjectsVersions { get { - return _rmlextensioncolorshadestestsdata; + return _publishedprocedureprojectsversions; } set { - _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); } } - private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + private ICollectionView _publishedprocedureprojectsversionsViewSource; /// - /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + /// Gets or sets the PublishedProcedureProjectsVersions View Source. /// - public ICollectionView RmlExtensionColorShadesTestsDataViewSource + public ICollectionView PublishedProcedureProjectsVersionsViewSource { get { - return _rmlextensioncolorshadestestsdataViewSource; + return _publishedprocedureprojectsversionsViewSource; } set { - _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); } } - private ObservableCollection _rmlextensiontestresultsfiles; + private ObservableCollection _rmlextensiontestwashingresults; /// - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// - public ObservableCollection RmlExtensionTestResultsFiles + public ObservableCollection RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + _rmlextensiontestwashingresults = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } } - private ICollectionView _rmlextensiontestresultsfilesViewSource; + private ICollectionView _rmlextensiontestwashingresultsViewSource; /// - /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// Gets or sets the RmlExtensionTestWashingResults View Source. /// - public ICollectionView RmlExtensionTestResultsFilesViewSource + public ICollectionView RmlExtensionTestWashingResultsViewSource { get { - return _rmlextensiontestresultsfilesViewSource; + return _rmlextensiontestwashingresultsViewSource; } set { - _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + _rmlextensiontestwashingresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResultsViewSource)); } } @@ -4229,6 +4265,42 @@ namespace Tango.BL } + private ObservableCollection _washingtestmaterials; + /// + /// Gets or sets the WashingTestMaterials. + /// + public ObservableCollection WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + _washingtestmaterials = value; RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + } + + private ICollectionView _washingtestmaterialsViewSource; + /// + /// Gets or sets the WashingTestMaterials View Source. + /// + public ICollectionView WashingTestMaterialsViewSource + { + get + { + return _washingtestmaterialsViewSource; + } + + set + { + _washingtestmaterialsViewSource = value; RaisePropertyChanged(nameof(WashingTestMaterialsViewSource)); + } + + } + private ObservableCollection _windingmethods; /// /// Gets or sets the WindingMethods. @@ -4307,6 +4379,22 @@ namespace Tango.BL YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades); + RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); + + RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); + + RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); + + RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); + + RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); + + RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); + + RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); + + RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + ActionLogsViewSource = CreateCollectionView(ActionLogs); AddressesViewSource = CreateCollectionView(Addresses); @@ -4441,21 +4529,7 @@ namespace Tango.BL PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions); - RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); - - RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); - - RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); - - RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); - - RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); - - RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); - - RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); - - RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + RmlExtensionTestWashingResultsViewSource = CreateCollectionView(RmlExtensionTestWashingResults); RmlsViewSource = CreateCollectionView(Rmls); @@ -4505,6 +4579,8 @@ namespace Tango.BL UsersRolesViewSource = CreateCollectionView(UsersRoles); + WashingTestMaterialsViewSource = CreateCollectionView(WashingTestMaterials); + WindingMethodsViewSource = CreateCollectionView(WindingMethods); } diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index e3b7a68ea..b40fbb618 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -665,6 +665,294 @@ namespace Tango.BL } + private ObservableCollection _rmlextensioncolorcalibrations; + /// + /// Gets or sets the RmlExtensionColorCalibrations. + /// + public ObservableCollection RmlExtensionColorCalibrations + { + get + { + return _rmlextensioncolorcalibrations; + } + + set + { + _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrations View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsViewSource + { + get + { + return _rmlextensioncolorcalibrationsViewSource; + } + + set + { + _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstests; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// + public ObservableCollection RmlExtensionColorCalibrationsTests + { + get + { + return _rmlextensioncolorcalibrationstests; + } + + set + { + _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddata; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// + public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidData + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddata; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddatapoints; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// + public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapoints; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshades; + /// + /// Gets or sets the RmlExtensionColorShades. + /// + public ObservableCollection RmlExtensionColorShades + { + get + { + return _rmlextensioncolorshades; + } + + set + { + _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + } + + } + + private ICollectionView _rmlextensioncolorshadesViewSource; + /// + /// Gets or sets the RmlExtensionColorShades View Source. + /// + public ICollectionView RmlExtensionColorShadesViewSource + { + get + { + return _rmlextensioncolorshadesViewSource; + } + + set + { + _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshadestests; + /// + /// Gets or sets the RmlExtensionColorShadesTests. + /// + public ObservableCollection RmlExtensionColorShadesTests + { + get + { + return _rmlextensioncolorshadestests; + } + + set + { + _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsViewSource; + /// + /// Gets or sets the RmlExtensionColorShadesTests View Source. + /// + public ICollectionView RmlExtensionColorShadesTestsViewSource + { + get + { + return _rmlextensioncolorshadestestsViewSource; + } + + set + { + _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshadestestsdata; + /// + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// + public ObservableCollection RmlExtensionColorShadesTestsData + { + get + { + return _rmlextensioncolorshadestestsdata; + } + + set + { + _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + /// + /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + /// + public ICollectionView RmlExtensionColorShadesTestsDataViewSource + { + get + { + return _rmlextensioncolorshadestestsdataViewSource; + } + + set + { + _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + } + + } + + private ObservableCollection _rmlextensiontestresultsfiles; + /// + /// Gets or sets the RmlExtensionTestResultsFiles. + /// + public ObservableCollection RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + + } + + private ICollectionView _rmlextensiontestresultsfilesViewSource; + /// + /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// + public ICollectionView RmlExtensionTestResultsFilesViewSource + { + get + { + return _rmlextensiontestresultsfilesViewSource; + } + + set + { + _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + } + + } + private ObservableCollection _actionlogs; /// /// Gets or sets the ActionLogs. @@ -2737,630 +3025,378 @@ namespace Tango.BL private ICollectionView _mediaconditionsViewSource; /// - /// Gets or sets the MediaConditions View Source. - /// - public ICollectionView MediaConditionsViewSource - { - get - { - return _mediaconditionsViewSource; - } - - set - { - _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); - } - - } - - private ObservableCollection _mediamaterials; - /// - /// Gets or sets the MediaMaterials. - /// - public ObservableCollection MediaMaterials - { - get - { - return _mediamaterials; - } - - set - { - _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); - } - - } - - private ICollectionView _mediamaterialsViewSource; - /// - /// Gets or sets the MediaMaterials View Source. - /// - public ICollectionView MediaMaterialsViewSource - { - get - { - return _mediamaterialsViewSource; - } - - set - { - _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); - } - - } - - private ObservableCollection _mediapurposes; - /// - /// Gets or sets the MediaPurposes. - /// - public ObservableCollection MediaPurposes - { - get - { - return _mediapurposes; - } - - set - { - _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); - } - - } - - private ICollectionView _mediapurposesViewSource; - /// - /// Gets or sets the MediaPurposes View Source. - /// - public ICollectionView MediaPurposesViewSource - { - get - { - return _mediapurposesViewSource; - } - - set - { - _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); - } - - } - - private ObservableCollection _midtanktypes; - /// - /// Gets or sets the MidTankTypes. - /// - public ObservableCollection MidTankTypes - { - get - { - return _midtanktypes; - } - - set - { - _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); - } - - } - - private ICollectionView _midtanktypesViewSource; - /// - /// Gets or sets the MidTankTypes View Source. - /// - public ICollectionView MidTankTypesViewSource - { - get - { - return _midtanktypesViewSource; - } - - set - { - _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); - } - - } - - private ObservableCollection _organizations; - /// - /// Gets or sets the Organizations. - /// - public ObservableCollection Organizations - { - get - { - return _organizations; - } - - set - { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } - - } - - private ICollectionView _organizationsViewSource; - /// - /// Gets or sets the Organizations View Source. - /// - public ICollectionView OrganizationsViewSource - { - get - { - return _organizationsViewSource; - } - - set - { - _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); - } - - } - - private ObservableCollection _permissions; - /// - /// Gets or sets the Permissions. - /// - public ObservableCollection Permissions - { - get - { - return _permissions; - } - - set - { - _permissions = value; RaisePropertyChanged(nameof(Permissions)); - } - - } - - private ICollectionView _permissionsViewSource; - /// - /// Gets or sets the Permissions View Source. - /// - public ICollectionView PermissionsViewSource - { - get - { - return _permissionsViewSource; - } - - set - { - _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); - } - - } - - private ObservableCollection _processparameterstables; - /// - /// Gets or sets the ProcessParametersTables. - /// - public ObservableCollection ProcessParametersTables - { - get - { - return _processparameterstables; - } - - set - { - _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); - } - - } - - private ICollectionView _processparameterstablesViewSource; - /// - /// Gets or sets the ProcessParametersTables View Source. - /// - public ICollectionView ProcessParametersTablesViewSource - { - get - { - return _processparameterstablesViewSource; - } - - set - { - _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); - } - - } - - private ObservableCollection _processparameterstablesgroups; - /// - /// Gets or sets the ProcessParametersTablesGroups. - /// - public ObservableCollection ProcessParametersTablesGroups - { - get - { - return _processparameterstablesgroups; - } - - set - { - _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); - } - - } - - private ICollectionView _processparameterstablesgroupsViewSource; - /// - /// Gets or sets the ProcessParametersTablesGroups View Source. + /// Gets or sets the MediaConditions View Source. /// - public ICollectionView ProcessParametersTablesGroupsViewSource + public ICollectionView MediaConditionsViewSource { get { - return _processparameterstablesgroupsViewSource; + return _mediaconditionsViewSource; } set { - _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); + _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); } } - private ObservableCollection _publishedprocedureprojects; + private ObservableCollection _mediamaterials; /// - /// Gets or sets the PublishedProcedureProjects. + /// Gets or sets the MediaMaterials. /// - public ObservableCollection PublishedProcedureProjects + public ObservableCollection MediaMaterials { get { - return _publishedprocedureprojects; + return _mediamaterials; } set { - _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); + _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); } } - private ICollectionView _publishedprocedureprojectsViewSource; + private ICollectionView _mediamaterialsViewSource; /// - /// Gets or sets the PublishedProcedureProjects View Source. + /// Gets or sets the MediaMaterials View Source. /// - public ICollectionView PublishedProcedureProjectsViewSource + public ICollectionView MediaMaterialsViewSource { get { - return _publishedprocedureprojectsViewSource; + return _mediamaterialsViewSource; } set { - _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); + _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); } } - private ObservableCollection _publishedprocedureprojectsversions; + private ObservableCollection _mediapurposes; /// - /// Gets or sets the PublishedProcedureProjectsVersions. + /// Gets or sets the MediaPurposes. /// - public ObservableCollection PublishedProcedureProjectsVersions + public ObservableCollection MediaPurposes { get { - return _publishedprocedureprojectsversions; + return _mediapurposes; } set { - _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); + _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); } } - private ICollectionView _publishedprocedureprojectsversionsViewSource; + private ICollectionView _mediapurposesViewSource; /// - /// Gets or sets the PublishedProcedureProjectsVersions View Source. + /// Gets or sets the MediaPurposes View Source. /// - public ICollectionView PublishedProcedureProjectsVersionsViewSource + public ICollectionView MediaPurposesViewSource { get { - return _publishedprocedureprojectsversionsViewSource; + return _mediapurposesViewSource; } set { - _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); + _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrations; + private ObservableCollection _midtanktypes; /// - /// Gets or sets the RmlExtensionColorCalibrations. + /// Gets or sets the MidTankTypes. /// - public ObservableCollection RmlExtensionColorCalibrations + public ObservableCollection MidTankTypes { get { - return _rmlextensioncolorcalibrations; + return _midtanktypes; } set { - _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); } } - private ICollectionView _rmlextensioncolorcalibrationsViewSource; + private ICollectionView _midtanktypesViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrations View Source. + /// Gets or sets the MidTankTypes View Source. /// - public ICollectionView RmlExtensionColorCalibrationsViewSource + public ICollectionView MidTankTypesViewSource { get { - return _rmlextensioncolorcalibrationsViewSource; + return _midtanktypesViewSource; } set { - _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstests; + private ObservableCollection _organizations; /// - /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// Gets or sets the Organizations. /// - public ObservableCollection RmlExtensionColorCalibrationsTests + public ObservableCollection Organizations { get { - return _rmlextensioncolorcalibrationstests; + return _organizations; } set { - _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + _organizations = value; RaisePropertyChanged(nameof(Organizations)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + private ICollectionView _organizationsViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + /// Gets or sets the Organizations View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + public ICollectionView OrganizationsViewSource { get { - return _rmlextensioncolorcalibrationstestsViewSource; + return _organizationsViewSource; } set { - _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddata; + private ObservableCollection _permissions; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// Gets or sets the Permissions. /// - public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidData + public ObservableCollection Permissions { get { - return _rmlextensioncolorcalibrationstestsliquiddata; + return _permissions; } set { - _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + _permissions = value; RaisePropertyChanged(nameof(Permissions)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + private ICollectionView _permissionsViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + /// Gets or sets the Permissions View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + public ICollectionView PermissionsViewSource { get { - return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + return _permissionsViewSource; } set { - _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddatapoints; + private ObservableCollection _processparameterstables; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// Gets or sets the ProcessParametersTables. /// - public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidDataPoints + public ObservableCollection ProcessParametersTables { get { - return _rmlextensioncolorcalibrationstestsliquiddatapoints; + return _processparameterstables; } set { - _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + private ICollectionView _processparameterstablesViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + /// Gets or sets the ProcessParametersTables View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + public ICollectionView ProcessParametersTablesViewSource { get { - return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + return _processparameterstablesViewSource; } set { - _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); } } - private ObservableCollection _rmlextensioncolorshades; + private ObservableCollection _processparameterstablesgroups; /// - /// Gets or sets the RmlExtensionColorShades. + /// Gets or sets the ProcessParametersTablesGroups. /// - public ObservableCollection RmlExtensionColorShades + public ObservableCollection ProcessParametersTablesGroups { get { - return _rmlextensioncolorshades; + return _processparameterstablesgroups; } set { - _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); } } - private ICollectionView _rmlextensioncolorshadesViewSource; + private ICollectionView _processparameterstablesgroupsViewSource; /// - /// Gets or sets the RmlExtensionColorShades View Source. + /// Gets or sets the ProcessParametersTablesGroups View Source. /// - public ICollectionView RmlExtensionColorShadesViewSource + public ICollectionView ProcessParametersTablesGroupsViewSource { get { - return _rmlextensioncolorshadesViewSource; + return _processparameterstablesgroupsViewSource; } set { - _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); } } - private ObservableCollection _rmlextensioncolorshadestests; + private ObservableCollection _publishedprocedureprojects; /// - /// Gets or sets the RmlExtensionColorShadesTests. + /// Gets or sets the PublishedProcedureProjects. /// - public ObservableCollection RmlExtensionColorShadesTests + public ObservableCollection PublishedProcedureProjects { get { - return _rmlextensioncolorshadestests; + return _publishedprocedureprojects; } set { - _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); } } - private ICollectionView _rmlextensioncolorshadestestsViewSource; + private ICollectionView _publishedprocedureprojectsViewSource; /// - /// Gets or sets the RmlExtensionColorShadesTests View Source. + /// Gets or sets the PublishedProcedureProjects View Source. /// - public ICollectionView RmlExtensionColorShadesTestsViewSource + public ICollectionView PublishedProcedureProjectsViewSource { get { - return _rmlextensioncolorshadestestsViewSource; + return _publishedprocedureprojectsViewSource; } set { - _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); } } - private ObservableCollection _rmlextensioncolorshadestestsdata; + private ObservableCollection _publishedprocedureprojectsversions; /// - /// Gets or sets the RmlExtensionColorShadesTestsData. + /// Gets or sets the PublishedProcedureProjectsVersions. /// - public ObservableCollection RmlExtensionColorShadesTestsData + public ObservableCollection PublishedProcedureProjectsVersions { get { - return _rmlextensioncolorshadestestsdata; + return _publishedprocedureprojectsversions; } set { - _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); } } - private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + private ICollectionView _publishedprocedureprojectsversionsViewSource; /// - /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + /// Gets or sets the PublishedProcedureProjectsVersions View Source. /// - public ICollectionView RmlExtensionColorShadesTestsDataViewSource + public ICollectionView PublishedProcedureProjectsVersionsViewSource { get { - return _rmlextensioncolorshadestestsdataViewSource; + return _publishedprocedureprojectsversionsViewSource; } set { - _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); } } - private ObservableCollection _rmlextensiontestresultsfiles; + private ObservableCollection _rmlextensiontestwashingresults; /// - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// - public ObservableCollection RmlExtensionTestResultsFiles + public ObservableCollection RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + _rmlextensiontestwashingresults = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } } - private ICollectionView _rmlextensiontestresultsfilesViewSource; + private ICollectionView _rmlextensiontestwashingresultsViewSource; /// - /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// Gets or sets the RmlExtensionTestWashingResults View Source. /// - public ICollectionView RmlExtensionTestResultsFilesViewSource + public ICollectionView RmlExtensionTestWashingResultsViewSource { get { - return _rmlextensiontestresultsfilesViewSource; + return _rmlextensiontestwashingresultsViewSource; } set { - _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + _rmlextensiontestwashingresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResultsViewSource)); } } @@ -4229,6 +4265,42 @@ namespace Tango.BL } + private ObservableCollection _washingtestmaterials; + /// + /// Gets or sets the WashingTestMaterials. + /// + public ObservableCollection WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + _washingtestmaterials = value; RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + } + + private ICollectionView _washingtestmaterialsViewSource; + /// + /// Gets or sets the WashingTestMaterials View Source. + /// + public ICollectionView WashingTestMaterialsViewSource + { + get + { + return _washingtestmaterialsViewSource; + } + + set + { + _washingtestmaterialsViewSource = value; RaisePropertyChanged(nameof(WashingTestMaterialsViewSource)); + } + + } + private ObservableCollection _windingmethods; /// /// Gets or sets the WindingMethods. @@ -4307,6 +4379,22 @@ namespace Tango.BL YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades); + RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); + + RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); + + RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); + + RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); + + RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); + + RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); + + RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); + + RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + ActionLogsViewSource = CreateCollectionView(ActionLogs); AddressesViewSource = CreateCollectionView(Addresses); @@ -4441,21 +4529,7 @@ namespace Tango.BL PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions); - RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); - - RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); - - RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); - - RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); - - RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); - - RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); - - RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); - - RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + RmlExtensionTestWashingResultsViewSource = CreateCollectionView(RmlExtensionTestWashingResults); RmlsViewSource = CreateCollectionView(Rmls); @@ -4505,6 +4579,8 @@ namespace Tango.BL UsersRolesViewSource = CreateCollectionView(UsersRoles); + WashingTestMaterialsViewSource = CreateCollectionView(WashingTestMaterials); + WindingMethodsViewSource = CreateCollectionView(WindingMethods); } diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 8bdb3b3f5..259b2ce6b 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -307,6 +307,8 @@ + + @@ -357,6 +359,8 @@ + + @@ -495,6 +499,8 @@ + + @@ -537,6 +543,8 @@ + + @@ -812,7 +820,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs index 5a4c082be..9f3026268 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs @@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB public string RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID { get; set; } public string LIQUID_TYPE_GUID { get; set; } - public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } public virtual RML_EXTENSION_COLOR_CALIBRATIONS_TESTS RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } + public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs index c530978d8..e0543a58c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB { this.TENSILE_RESULTS = new HashSet(); this.RML_EXTENSION_TEST_RESULTS_FILES = new HashSet(); + this.RML_EXTENSION_TEST_WASHING_RESULTS = new HashSet(); this.RUBBING_RESULTS = new HashSet(); } @@ -61,9 +62,11 @@ namespace Tango.DAL.Remote.DB public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection TENSILE_RESULTS { get; set; } - public virtual MACHINE MACHINE { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual MACHINE MACHINE { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RUBBING_RESULTS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs new file mode 100644 index 000000000..c97f1ab73 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class RML_EXTENSION_TEST_WASHING_RESULTS + { + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string RML_EXTENSION_TEST_RESULTS_GUID { get; set; } + public string WASHING_TEST_MATERIALS_GUID { get; set; } + public int COLOR { get; set; } + public Nullable WASHING_VALUE { get; set; } + + public virtual RML_EXTENSION_TEST_RESULTS RML_EXTENSION_TEST_RESULTS { get; set; } + public virtual WASHING_TEST_MATERIALS WASHING_TEST_MATERIALS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index 504edd34b..a4879a500 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -43,6 +43,14 @@ namespace Tango.DAL.Remote.DB public virtual DbSet YARN_TEXTURINGS { get; set; } public virtual DbSet YARN_TYPES { get; set; } public virtual DbSet YARN_WHITE_SHADES { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; } + public virtual DbSet RML_EXTENSION_TEST_RESULTS_FILES { get; set; } public virtual DbSet ACTION_LOGS { get; set; } public virtual DbSet
ADDRESSES { get; set; } public virtual DbSet APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } @@ -110,14 +118,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet PROCESS_PARAMETERS_TABLES_GROUPS { get; set; } public virtual DbSet PUBLISHED_PROCEDURE_PROJECTS { get; set; } public virtual DbSet PUBLISHED_PROCEDURE_PROJECTS_VERSIONS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; } - public virtual DbSet RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual DbSet RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } public virtual DbSet RMLS { get; set; } public virtual DbSet RMLS_SPOOLS { get; set; } public virtual DbSet ROLES { get; set; } @@ -142,6 +143,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet TECH_VALVES { get; set; } public virtual DbSet USERS { get; set; } public virtual DbSet USERS_ROLES { get; set; } + public virtual DbSet WASHING_TEST_MATERIALS { get; set; } public virtual DbSet WINDING_METHODS { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index ed6e629ac..f367a5aa0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1230,6 +1230,18 @@ + + + + + + + + + + + + @@ -1653,6 +1665,15 @@ + + + + + + + + + @@ -2841,6 +2862,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3499,6 +3548,7 @@ + @@ -3526,6 +3576,7 @@ + @@ -3862,6 +3913,14 @@ + + + + + + + + @@ -4126,6 +4185,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4193,14 +4292,7 @@ - - - - - - - - + @@ -4225,6 +4317,7 @@ + @@ -4578,42 +4671,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + @@ -4769,8 +4838,9 @@ - + + @@ -5141,150 +5211,375 @@ - + - - - - - - - + + + + + - + - - - - - - - - - + + + + - + - - - + + + + + - + - - - + + + + + + + - + - - - + + + + + - + - - - - - - + + + + - + - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6325,108 +6620,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6434,9 +6628,11 @@ - - - + + + + + @@ -6859,6 +7055,16 @@ + + + + + + + + + + @@ -7977,156 +8183,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - + - + - + @@ -8145,6 +8253,20 @@ + + + + + + + + + + + + + + @@ -8603,6 +8725,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9716,104 +9943,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -10207,6 +10342,16 @@ + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 27f6a9fa1..2cc7da5b5 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,98 +5,100 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + + - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -179,6 +181,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs new file mode 100644 index 000000000..62f08e111 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs @@ -0,0 +1,31 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class WASHING_TEST_MATERIALS + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public WASHING_TEST_MATERIALS() + { + this.RML_EXTENSION_TEST_WASHING_RESULTS = new HashSet(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string NAME { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index e58f7fd5b..79beff832 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -327,6 +327,9 @@ RemoteADO.tt + + RemoteADO.tt + RemoteADO.tt @@ -399,6 +402,9 @@ RemoteADO.tt + + RemoteADO.tt + RemoteADO.tt @@ -485,7 +491,7 @@ - + \ No newline at end of file -- cgit v1.3.1 From 516ee0b585d84bda4fcc3c31aa44d1e3b7da5e93 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 28 Jul 2022 18:33:11 +0300 Subject: MS. RML extension. Added table washing test results , GUI and database. Related Work Items: #6660 --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../Models/WashingMaterialColorModel.cs | 255 +++++++++ .../Tango.MachineStudio.ThreadExtensions.csproj | 5 + .../ViewModels/TestResultViewVM.cs | 14 + .../ViewModels/TestResultsViewVM.cs | 64 ++- .../Views/TestResultsView.xaml | 602 ++++++++++++--------- .../Views/TestResultsView.xaml.cs | 13 + .../DTO/RmlExtensionTestWashingResultDTOBase.cs | 8 + .../Entities/RmlExtensionTestWashingResult.cs | 35 +- .../Entities/RmlExtensionTestWashingResultBase.cs | 38 ++ .../ColorCanvas/Implementation/ColorCanvas.cs | 3 +- .../DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 3 + .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 174 +++--- 15 files changed, 871 insertions(+), 344 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/WashingMaterialColorModel.cs (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index ae97d44f3..e333b6ee5 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 320ca4e52..b5da0b516 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/WashingMaterialColorModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/WashingMaterialColorModel.cs new file mode 100644 index 000000000..868ce1d58 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/WashingMaterialColorModel.cs @@ -0,0 +1,255 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core; + +namespace Tango.MachineStudio.ThreadExtensions.Models +{ + public class WashingMaterialColorModel : ExtendedObject + { + public class MaterialColorValueModel: ExtendedObject + { + private string _materialName; + + public string MaterialName + { + get { return _materialName; } + set + { + _materialName = value; + RaisePropertyChangedAuto(); + } + } + + private double? _colorValue; + + public double? ColorValue + { + get { return _colorValue; } + set { + _colorValue= value; + RaisePropertyChangedAuto(); + } + } + + public string RmlExtensionTestWashingResultGUID { get; set; } + } + + private int _index; + + public int Index + { + get { return _index; } + set { _index = value; } + } + + private int _color; + + public int Color + { + get { return _color; } + set + { + _color = value; + RaisePropertyChangedAuto(); + } + } + + private List _colorValues; + + public List ColorValues + { + get { return _colorValues; } + set { _colorValues = value; + RaisePropertyChangedAuto(); } + } + + + public double? WashingValue1 + { + get { + if (ColorValues.Count >= 1) + return ColorValues[0].ColorValue; + return null; + } + set { + if (ColorValues.Count >= 1) + ColorValues[0].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue2 + { + get + { + if (ColorValues.Count > 1) + return ColorValues[1].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 1) + ColorValues[1].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue3 + { + get + { + if (ColorValues.Count > 2) + return ColorValues[2].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 2) + ColorValues[2].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue4 + { + get + { + if (ColorValues.Count > 3) + return ColorValues[3].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 3) + ColorValues[3].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue5 + { + get + { + if (ColorValues.Count > 4) + return ColorValues[4].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 4) + ColorValues[4].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue6 + { + get + { + if (ColorValues.Count > 5) + return ColorValues[5].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 5) + ColorValues[5].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue7 + { + get + { + if (ColorValues.Count > 6) + return ColorValues[6].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 6) + ColorValues[6].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public string Header1 + { + get + { + if (ColorValues.Count >= 1) + return ColorValues[0].MaterialName; + return null; + } + } + public string Header2 + { + get + { + if (ColorValues.Count > 1) + return ColorValues[1].MaterialName; + return null; + } + } + public string Header3 + { + get + { + if (ColorValues.Count > 2) + return ColorValues[2].MaterialName; + return null; + } + } + public string Header4 + { + get + { + if (ColorValues.Count > 3) + return ColorValues[3].MaterialName; + return null; + } + } + public string Header5 + { + get + { + if (ColorValues.Count > 4) + return ColorValues[4].MaterialName; + return null; + } + } + public string Header6 + { + get + { + if (ColorValues.Count > 5) + return ColorValues[5].MaterialName; + return null; + } + } + public string Header7 + { + get + { + if (ColorValues.Count > 6) + return ColorValues[6].MaterialName; + return null; + } + } + + public WashingMaterialColorModel() + { + ColorValues = new List(); + } + + public void AddMaterial(string rmlExtensionTestWashingResultGuid, string materialName, double? colorValue) + { + ColorValues.Add(new MaterialColorValueModel(){ MaterialName = materialName, ColorValue = colorValue, RmlExtensionTestWashingResultGUID = rmlExtensionTestWashingResultGuid}); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj index f8d6419f6..000ab221a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj @@ -117,6 +117,7 @@ + @@ -258,6 +259,10 @@ {b60c695c-61e8-4091-b506-4c45349c04aa} Tango.ColorCalibration + + {a2f5af44-29ff-45d6-9d25-ecda5cce88b5} + Tango.ColorPicker + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs index 68a886f99..624ee7216 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs @@ -18,6 +18,7 @@ using Tango.Core.Commands; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.ThreadExtensions.Models; using Tango.SharedUI; +using System.Collections.ObjectModel; namespace Tango.MachineStudio.ThreadExtensions.ViewModels { @@ -66,6 +67,18 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels RaisePropertyChanged(nameof(TestResultsFiles)); } } + + private ObservableCollection _colorsToMaterialCollection; + + public ObservableCollection ColorsToMaterialCollection + { + get { return _colorsToMaterialCollection; } + set { _colorsToMaterialCollection = value; + RaisePropertyChangedAuto(); + } + } + + public List TestResultsFiles { @@ -91,6 +104,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels DownLoadFileCommand = new RelayCommand(DownLoadFile); DeleteCommand = new RelayCommand(DeleteFile); DownLoadAllCommand = new RelayCommand(DownLoadAllFiles); + } #region TestResultsFiles diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs index cc1bba0e7..2dd444f0f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs @@ -275,7 +275,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels ResultTabs.Clear(); if(WashingTestMaterials == null) - WashingTestMaterials = _active_context.WashingTestMaterials.ToList(); + WashingTestMaterials = _active_context.WashingTestMaterials.OrderBy(x=> x.Name).ToList(); LogManager.Log("Loading selected test results..."); @@ -336,25 +336,54 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels CreateWashingResult(newtab); + return newtab; } private void CreateWashingResult(TestResultViewVM testresultViewVM) { - if(testresultViewVM.TestResult.RmlExtensionTestWashingResults != null) - return; - - var whashingresults = new SynchronizedObservableCollection(); - foreach (var material in WashingTestMaterials) + if(testresultViewVM.TestResult.RmlExtensionTestWashingResults != null && testresultViewVM.TestResult.RmlExtensionTestWashingResults.Count > 0 ) { - foreach (WashingResultColor color in Enum.GetValues(typeof(WashingResultColor))) + var collection = new ObservableCollection(); + Dictionary colorDictionary = new Dictionary(); + List< RmlExtensionTestWashingResult > washingResultsOrdersByColor = testresultViewVM.TestResult.RmlExtensionTestWashingResults.OrderBy(x=>x.IndexRow).ThenBy(c => c.WashingTestMaterials != null ? c.WashingTestMaterials.Name : c.WashingTestMaterialsGuid).ToList(); + foreach (var res in washingResultsOrdersByColor) { - whashingresults.Add(new RmlExtensionTestWashingResult() { RmlExtensionTestResultsGuid = testresultViewVM.TestResult.Guid, WashingTestMaterialsGuid = material.Guid, Color = (int)color }); + WashingMaterialColorModel wmodel = null; + if(false == colorDictionary.TryGetValue(res.IndexRow, out wmodel)) + { + wmodel = new WashingMaterialColorModel() { Color = res.Color }; + colorDictionary.Add(res.IndexRow, wmodel); + collection.Add(wmodel); + } + wmodel.AddMaterial(res.Guid, res.GetMaterialName, res.WashingValue); } + testresultViewVM.ColorsToMaterialCollection = collection; } - testresultViewVM.TestResult.RmlExtensionTestWashingResults = whashingresults; + else + { + var whashingresults = new SynchronizedObservableCollection(); + var collecction = new ObservableCollection(); + for (int index_row = 0; index_row < 6; index_row++) + { + var model = new WashingMaterialColorModel() { Color = -1 }; + + foreach (var material in WashingTestMaterials) + { + var rmlExtensionTestWashingResult = new RmlExtensionTestWashingResult() { RmlExtensionTestResultsGuid = testresultViewVM.TestResult.Guid, WashingTestMaterialsGuid = material.Guid, Color = -1, IndexRow = index_row }; + model.AddMaterial(rmlExtensionTestWashingResult.Guid, material.Name, null); + rmlExtensionTestWashingResult.WashingTestMaterials = material; + whashingresults.Add(rmlExtensionTestWashingResult); + + } + collecction.Add( model); + } + testresultViewVM.ColorsToMaterialCollection = collecction; + testresultViewVM.TestResult.RmlExtensionTestWashingResults = whashingresults; + } } + #endregion #region Save @@ -398,6 +427,22 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } } + public void ApplyToWashingResults(TestResultViewVM testresultViewVM) + { + foreach ( var model in testresultViewVM.ColorsToMaterialCollection) + { + foreach( var colormodel in model.ColorValues) + { + var result = testresultViewVM.TestResult.RmlExtensionTestWashingResults.FirstOrDefault(x=> x.Guid == colormodel.RmlExtensionTestWashingResultGUID); + if( result != null) + { + result.Color = model.Color; + result.WashingValue = colormodel.ColorValue; + } + } + } + } + public async void Save() { if (String.IsNullOrEmpty(SelectedMachineGUID)) @@ -412,6 +457,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels { foreach (var tab in ResultTabs) { + ApplyToWashingResults(tab); tab.TestResult.LastUpdated = DateTime.UtcNow; } _active_context.SaveChanges(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index 0aceebc9a..77cac3648 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -12,10 +12,12 @@ xmlns:localconverters="clr-namespace:Tango.MachineStudio.ThreadExtensions.Converters" xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker" + xmlns:components="clr-namespace:Tango.SharedUI.Components;assembly=Tango.SharedUI" xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" xmlns:fa="http://schemas.fontawesome.io/icons/" mc:Ignorable="d" - d:DesignHeight="950" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" FontSize="16"> + d:DesignHeight="950" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" FontSize="14"> @@ -23,7 +25,8 @@ - + + + + + + + + + + + @@ -416,68 +413,146 @@ - + - - - + + + + + + + + + + + + + COLOR + + + + + + + + + + COLOR + + + + + + + + - + + + + + + - + - + + + + + + - + - + + + + + + + + + + + + + + + + + + + + - + - + + + + + + - + - + + + + + + - + - + + + + + + - + @@ -486,93 +561,155 @@ - - - - Tension through the thread path - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tension through the thread path + - Tension in Zone + Tension in Zone - Tensiometer (gr) + Tensiometer (gr) - Tension in Zone + Tension in Zone - MS + MS - Head + Head - - + + - BTSR + BTSR - - + + - After dryer + After dryer - - + + - Puller tension + Puller tension - - + + - Winder + Winder - - + + - Winder Exit Tension + Winder Exit Tension - - + + - - Mechanical properties - + + Mechanical properties + - - + + @@ -607,12 +744,13 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs index a75dc5d09..20be37970 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs @@ -52,5 +52,18 @@ namespace Tango.MachineStudio.ThreadExtensions.Views } } } + private void Popup_MouseDown(object sender, MouseButtonEventArgs e) + { + e.Handled = true; + } + private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs e) + { + if (e.NewValue.HasValue) + { + //_vm.OnSelectedBrushColorChanged((Color)e.NewValue); + } + } + } } + diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs index 9f98d4aa9..db4fd9893 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs @@ -37,6 +37,14 @@ namespace Tango.BL.DTO get; set; } + /// + /// index row + /// + public Int32 IndexRow + { + get; set; + } + /// /// color /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs index af8858e64..9d67cef70 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs @@ -1,8 +1,12 @@ -using System; +using ColorMine.ColorSpaces; +using Newtonsoft.Json; +using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Media; namespace Tango.BL.Entities { @@ -12,5 +16,34 @@ namespace Tango.BL.Entities { } + + [NotMapped] + [JsonIgnore] + public string GetMaterialName + { + get + { + return WashingTestMaterials != null ? WashingTestMaterials.Name : ""; + } + } + + //[NotMapped] + //[JsonIgnore] + //public Color ColorValue + //{ + // get + // { + // byte[] bytes = BitConverter.GetBytes(Color); + // var color1 = new SolidColorBrush(System.Windows.Media.Color.FromArgb(bytes[3], bytes[2], bytes[1], bytes[0])); + // return System.Windows.Media.Color.FromRgb(bytes[2], bytes[1], bytes[0]); + // } + // set + // { + // int v = ColorToInteger(value); + // int colorCodeWithAlpha = BitConverter.ToInt32(new byte[] { value.B, value.G, value.R, value.A }, 0); + // Color = colorCodeWithAlpha; + // RaisePropertyChanged(nameof(Color)); + // } + //} } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs index 0927baa04..c4016bb40 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs @@ -27,6 +27,8 @@ namespace Tango.BL.Entities public abstract class RmlExtensionTestWashingResultBase : ObservableEntity { + public event EventHandler IndexRowChanged; + public event EventHandler ColorChanged; public event EventHandler> WashingValueChanged; @@ -87,6 +89,33 @@ namespace Tango.BL.Entities } } + protected Int32 _indexrow; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase index row. + /// + + [Column("INDEX_ROW")] + + public Int32 IndexRow + { + get + { + return _indexrow; + } + + set + { + if (_indexrow != value) + { + _indexrow = value; + + OnIndexRowChanged(value); + + } + } + } + protected Int32 _color; /// @@ -205,6 +234,15 @@ namespace Tango.BL.Entities } } + /// + /// Called when the IndexRow has changed. + /// + protected virtual void OnIndexRowChanged(Int32 indexrow) + { + IndexRowChanged?.Invoke(this, indexrow); + RaisePropertyChanged(nameof(IndexRow)); + } + /// /// Called when the Color has changed. /// diff --git a/Software/Visual_Studio/Tango.ColorPicker/ColorCanvas/Implementation/ColorCanvas.cs b/Software/Visual_Studio/Tango.ColorPicker/ColorCanvas/Implementation/ColorCanvas.cs index 6404c9af3..5d84309d8 100644 --- a/Software/Visual_Studio/Tango.ColorPicker/ColorCanvas/Implementation/ColorCanvas.cs +++ b/Software/Visual_Studio/Tango.ColorPicker/ColorCanvas/Implementation/ColorCanvas.cs @@ -549,7 +549,8 @@ namespace Tango var currentColor = ColorUtilities.ConvertHsvToRgb( hsv.H, hsv.S, hsv.V ); currentColor.A = A; _updateSpectrumSliderValue = false; - SelectedColor = currentColor; + if(SelectedColor != currentColor) + SelectedColor = currentColor; _updateSpectrumSliderValue = true; SetHexadecimalStringProperty( GetFormatedColorString( SelectedColor ), false ); } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs index c97f1ab73..f475d471d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB public System.DateTime LAST_UPDATED { get; set; } public string RML_EXTENSION_TEST_RESULTS_GUID { get; set; } public string WASHING_TEST_MATERIALS_GUID { get; set; } + public int INDEX_ROW { get; set; } public int COLOR { get; set; } public Nullable WASHING_VALUE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index f367a5aa0..eae61d93a 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1239,6 +1239,7 @@ + @@ -6629,6 +6630,7 @@ + @@ -9948,6 +9950,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 2cc7da5b5..f5a974c53 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -4,101 +4,101 @@ - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + -- cgit v1.3.1 From 6e4ddaeef2667e071f7f079876e98bd77ed233f3 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 7 Aug 2022 09:11:33 +0300 Subject: MS . RML Extension --- .../ViewModels/MainViewVM.cs | 6 +- .../ViewModels/TestResultsViewVM.cs | 19 +++++ .../Views/TestResultsView.xaml | 85 +++++++++++++++++----- .../Tango.BL/Builders/machinesCollectionBuilder.cs | 55 ++++++++++++++ 4 files changed, 145 insertions(+), 20 deletions(-) create mode 100644 Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs (limited to 'Software/Visual_Studio/MachineStudio') 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, diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs index 2dd444f0f..03c87a3a6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs @@ -129,6 +129,20 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } } + private ObservableCollection _btsrApplicationTypes; + public ObservableCollection BtsrApplicationTypes + { + get { return _btsrApplicationTypes; } + set { _btsrApplicationTypes = value; RaisePropertyChangedAuto(); } + } + + private ObservableCollection _btsrYarnTypes; + public ObservableCollection BtsrYarnTypes + { + get { return _btsrYarnTypes; } + set { _btsrYarnTypes = value; RaisePropertyChangedAuto(); } + } + #endregion #region Commands @@ -281,6 +295,11 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels using (_notification.PushTaskItem("Loading Test Results Parameters ...")) { + + BtsrApplicationTypes = _active_context.BtsrApplicationTypes.ToObservableCollection(); + + BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection(); + var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().BuildAsync(); SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection(); foreach (var result in SelectedTestResults) diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index 77cac3648..961c6b358 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -628,80 +628,129 @@ Tension through the thread path - + + + + + + + + + + + + + + + Tension in Zone - + Tensiometer (gr) - + Tension in Zone - - MS + + MS - + + + BTSR options + + + + + Head - + - + BTSR - + - + + Application Type + + + + + + + After dryer - + - + Puller tension - + - + + Yarn Type + + + + + + + + Winder - + - + Winder Exit Tension - + - + + Tension Error + + + + + + + + diff --git a/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs new file mode 100644 index 000000000..25ca3e8f3 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; +using System.Data.Entity; + +namespace Tango.BL.Builders +{ + public class MachinesCollectionBuilder : EntityCollectionBuilderBase + { + public MachinesCollectionBuilder(ObservablesContext context) : base(context) + { + + } + + public virtual MachinesCollectionBuilder WithVersion() + { + return AddQueryStep(1, (query) => + { + return query.Include(x => x.MachineVersion); + }); + + } + + public virtual MachinesCollectionBuilder WithOrganization() + { + return AddStep(2, () => + { + foreach (var machine in Entities.ToList()) + { + Context.Organizations.Where(x => x.Guid == machine.OrganizationGuid) + .Include(x => x.Address) + .Include(x => x.Contact).FirstOrDefault(); + } + }); + } + + public virtual MachinesCollectionBuilder WithConfiguration() + { + return AddStep(3, () => + { + foreach (var machine in Entities.ToList()) + { + new ConfigurationBuilder(Context) + .Set(machine.ConfigurationGuid) + .WithIdsPacks() + .WithHardwareVersion() + .Build(); + } + }); + } + } +} -- cgit v1.3.1 From 13e76d80896d61c476ff755a892c795ed4af6de6 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 31 Aug 2022 12:02:47 +0300 Subject: MS. RML Extension. Added Application Type, Yarn Type and Tension Error to Test results table. Changes in database. Related Work Items: #6347 --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../ViewModels/MainViewVM.cs | 13 +- .../ViewModels/TestResultsViewVM.cs | 2 +- .../Views/TestResultsView.xaml | 18 +- .../RMLExtensionTestResultsCollectionBuilder.cs | 24 +++ .../Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs | 24 +++ .../Tango.BL/Entities/BtsrApplicationTypeBase.cs | 38 +++++ .../Tango.BL/Entities/BtsrYarnTypeBase.cs | 38 +++++ .../Entities/RmlExtensionColorCalibrationBase.cs | 76 ++++----- ...xtensionColorCalibrationsTestsLiquidDataBase.cs | 76 ++++----- .../Entities/RmlExtensionColorShadeBase.cs | 76 ++++----- .../Entities/RmlExtensionTestResultBase.cs | 176 +++++++++++++++++++ Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 3 +- .../Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs | 3 + .../Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs | 3 + .../DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs | 2 +- .../DB/RML_EXTENSION_COLOR_SHADES.cs | 2 +- .../DB/RML_EXTENSION_TEST_RESULTS.cs | 5 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 77 +++++++++ .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 188 ++++++++++----------- 21 files changed, 615 insertions(+), 229 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index e333b6ee5..58379c5c6 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index b5da0b516..447c4cdb7 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ 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)) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs index 03c87a3a6..ba7ae7238 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs @@ -300,7 +300,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection(); - var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().BuildAsync(); + var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().WithBtsrApplicationTypes().WithBtsrYarnTypes().BuildAsync(); SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection(); foreach (var result in SelectedTestResults) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index 961c6b358..4ebc9077b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -686,9 +686,9 @@ Application Type - - - + + + After dryer @@ -714,11 +714,9 @@ Yarn Type - - - - + + + Winder @@ -745,9 +743,7 @@ - - + diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs index 19c027976..a9aabdbdd 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs @@ -80,5 +80,29 @@ namespace Tango.BL.Builders } }); } + + public virtual RMLExtensionTestResultsCollectionBuilder WithBtsrApplicationTypes() + { + return AddStep(5, () => + { + foreach (var result in Entities.ToList()) + { + if(!String.IsNullOrEmpty(result.BtsrApplicationTypeGuid)) + result.BtsrApplicationType = Context.BtsrApplicationTypes.FirstOrDefault(x => x.Guid == result.BtsrApplicationTypeGuid); + } + }); + } + + public virtual RMLExtensionTestResultsCollectionBuilder WithBtsrYarnTypes() + { + return AddStep(6, () => + { + foreach (var result in Entities.ToList()) + { + if (!String.IsNullOrEmpty(result.BtsrYarnTypeGuid)) + result.BtsrYarnType = Context.BtsrYarnTypes.FirstOrDefault(x => x.Guid == result.BtsrYarnTypeGuid); + } + }); + } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs index d48a36b22..0f2fa1675 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs @@ -277,5 +277,29 @@ namespace Tango.BL.DTO get; set; } + /// + /// btsr application type guid + /// + public String BtsrApplicationTypeGuid + { + get; set; + } + + /// + /// btsr yarn type guid + /// + public String BtsrYarnTypeGuid + { + get; set; + } + + /// + /// btsr tension error + /// + public Double BtsrTensionError + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs index ee1ff6ecc..70fd2c41e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs @@ -33,6 +33,8 @@ namespace Tango.BL.Entities public event EventHandler DescriptionChanged; + public event EventHandler> RmlExtensionTestResultsChanged; + public event EventHandler> RmlsChanged; protected Int32 _code; @@ -116,6 +118,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection _rmlextensiontestresults; + + /// + /// Gets or sets the btsrapplicationtypebase rml extension test results. + /// + + public virtual SynchronizedObservableCollection RmlExtensionTestResults + { + get + { + return _rmlextensiontestresults; + } + + set + { + if (_rmlextensiontestresults != value) + { + _rmlextensiontestresults = value; + + OnRmlExtensionTestResultsChanged(value); + + } + } + } + protected SynchronizedObservableCollection _rmls; /// @@ -168,6 +195,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Description)); } + /// + /// Called when the RmlExtensionTestResults has changed. + /// + protected virtual void OnRmlExtensionTestResultsChanged(SynchronizedObservableCollection rmlextensiontestresults) + { + RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults); + RaisePropertyChanged(nameof(RmlExtensionTestResults)); + } + /// /// Called when the Rmls has changed. /// @@ -183,6 +219,8 @@ namespace Tango.BL.Entities public BtsrApplicationTypeBase() : base() { + RmlExtensionTestResults = new SynchronizedObservableCollection(); + Rmls = new SynchronizedObservableCollection(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs index 608989fab..8128c8998 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs @@ -33,6 +33,8 @@ namespace Tango.BL.Entities public event EventHandler DescriptionChanged; + public event EventHandler> RmlExtensionTestResultsChanged; + public event EventHandler> RmlsChanged; protected Int32 _code; @@ -116,6 +118,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection _rmlextensiontestresults; + + /// + /// Gets or sets the btsryarntypebase rml extension test results. + /// + + public virtual SynchronizedObservableCollection RmlExtensionTestResults + { + get + { + return _rmlextensiontestresults; + } + + set + { + if (_rmlextensiontestresults != value) + { + _rmlextensiontestresults = value; + + OnRmlExtensionTestResultsChanged(value); + + } + } + } + protected SynchronizedObservableCollection _rmls; /// @@ -168,6 +195,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Description)); } + /// + /// Called when the RmlExtensionTestResults has changed. + /// + protected virtual void OnRmlExtensionTestResultsChanged(SynchronizedObservableCollection rmlextensiontestresults) + { + RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults); + RaisePropertyChanged(nameof(RmlExtensionTestResults)); + } + /// /// Called when the Rmls has changed. /// @@ -183,6 +219,8 @@ namespace Tango.BL.Entities public BtsrYarnTypeBase() : base() { + RmlExtensionTestResults = new SynchronizedObservableCollection(); + Rmls = new SynchronizedObservableCollection(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs index b858163d2..b2af4322d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs @@ -27,12 +27,12 @@ namespace Tango.BL.Entities public abstract class RmlExtensionColorCalibrationBase : ObservableEntity { - public event EventHandler MachineChanged; - public event EventHandler RmlsExtensionsChanged; public event EventHandler> RmlExtensionColorCalibrationsTestsChanged; + public event EventHandler MachineChanged; + protected String _rmlsextensionsguid; /// @@ -85,38 +85,6 @@ namespace Tango.BL.Entities } } - protected Machine _machine; - - /// - /// Gets or sets the rmlextensioncolorcalibrationbase machine. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual Machine Machine - { - get - { - return _machine; - } - - set - { - if (_machine != value) - { - _machine = value; - - if (Machine != null) - { - MachineGuid = Machine.Guid; - } - - OnMachineChanged(value); - - } - } - } - protected RmlsExtension _rmlsextensions; /// @@ -174,13 +142,36 @@ namespace Tango.BL.Entities } } + protected Machine _machine; + /// - /// Called when the Machine has changed. + /// Gets or sets the rmlextensioncolorcalibrationbase machine. /// - protected virtual void OnMachineChanged(Machine machine) + + [XmlIgnore] + [JsonIgnore] + public virtual Machine Machine { - MachineChanged?.Invoke(this, machine); - RaisePropertyChanged(nameof(Machine)); + get + { + return _machine; + } + + set + { + if (_machine != value) + { + _machine = value; + + if (Machine != null) + { + MachineGuid = Machine.Guid; + } + + OnMachineChanged(value); + + } + } } /// @@ -201,6 +192,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); } + /// + /// Called when the Machine has changed. + /// + protected virtual void OnMachineChanged(Machine machine) + { + MachineChanged?.Invoke(this, machine); + RaisePropertyChanged(nameof(Machine)); + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs index d55773809..d6ee701ba 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs @@ -27,12 +27,12 @@ namespace Tango.BL.Entities public abstract class RmlExtensionColorCalibrationsTestsLiquidDataBase : ObservableEntity { - public event EventHandler LiquidTypeChanged; - public event EventHandler RmlExtensionColorCalibrationsTestChanged; public event EventHandler> RmlExtensionColorCalibrationsTestsLiquidDataPointsChanged; + public event EventHandler LiquidTypeChanged; + protected String _rmlextensioncolorcalibrationstestguid; /// @@ -85,38 +85,6 @@ namespace Tango.BL.Entities } } - protected LiquidType _liquidtype; - - /// - /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase liquid types. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual LiquidType LiquidType - { - get - { - return _liquidtype; - } - - set - { - if (_liquidtype != value) - { - _liquidtype = value; - - if (LiquidType != null) - { - LiquidTypeGuid = LiquidType.Guid; - } - - OnLiquidTypeChanged(value); - - } - } - } - protected RmlExtensionColorCalibrationsTest _rmlextensioncolorcalibrationstest; /// @@ -174,13 +142,36 @@ namespace Tango.BL.Entities } } + protected LiquidType _liquidtype; + /// - /// Called when the LiquidType has changed. + /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase liquid types. /// - protected virtual void OnLiquidTypeChanged(LiquidType liquidtype) + + [XmlIgnore] + [JsonIgnore] + public virtual LiquidType LiquidType { - LiquidTypeChanged?.Invoke(this, liquidtype); - RaisePropertyChanged(nameof(LiquidType)); + get + { + return _liquidtype; + } + + set + { + if (_liquidtype != value) + { + _liquidtype = value; + + if (LiquidType != null) + { + LiquidTypeGuid = LiquidType.Guid; + } + + OnLiquidTypeChanged(value); + + } + } } /// @@ -201,6 +192,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); } + /// + /// Called when the LiquidType has changed. + /// + protected virtual void OnLiquidTypeChanged(LiquidType liquidtype) + { + LiquidTypeChanged?.Invoke(this, liquidtype); + RaisePropertyChanged(nameof(LiquidType)); + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs index b0386f13b..c0fa2ce5d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs @@ -27,12 +27,12 @@ namespace Tango.BL.Entities public abstract class RmlExtensionColorShadeBase : ObservableEntity { - public event EventHandler MachineChanged; - public event EventHandler RmlsExtensionsChanged; public event EventHandler> RmlExtensionColorShadesTestsChanged; + public event EventHandler MachineChanged; + protected String _rmlsextensionsguid; /// @@ -85,38 +85,6 @@ namespace Tango.BL.Entities } } - protected Machine _machine; - - /// - /// Gets or sets the rmlextensioncolorshadebase machine. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual Machine Machine - { - get - { - return _machine; - } - - set - { - if (_machine != value) - { - _machine = value; - - if (Machine != null) - { - MachineGuid = Machine.Guid; - } - - OnMachineChanged(value); - - } - } - } - protected RmlsExtension _rmlsextensions; /// @@ -174,13 +142,36 @@ namespace Tango.BL.Entities } } + protected Machine _machine; + /// - /// Called when the Machine has changed. + /// Gets or sets the rmlextensioncolorshadebase machine. /// - protected virtual void OnMachineChanged(Machine machine) + + [XmlIgnore] + [JsonIgnore] + public virtual Machine Machine { - MachineChanged?.Invoke(this, machine); - RaisePropertyChanged(nameof(Machine)); + get + { + return _machine; + } + + set + { + if (_machine != value) + { + _machine = value; + + if (Machine != null) + { + MachineGuid = Machine.Guid; + } + + OnMachineChanged(value); + + } + } } /// @@ -201,6 +192,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); } + /// + /// Called when the Machine has changed. + /// + protected virtual void OnMachineChanged(Machine machine) + { + MachineChanged?.Invoke(this, machine); + RaisePropertyChanged(nameof(Machine)); + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs index c53b14327..22844741c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs @@ -87,12 +87,18 @@ namespace Tango.BL.Entities public event EventHandler> ThreadLubChanged; + public event EventHandler BtsrTensionErrorChanged; + public event EventHandler RmlsExtensionsChanged; public event EventHandler> TensileResultsChanged; public event EventHandler> RmlExtensionTestResultsFilesChanged; + public event EventHandler BtsrApplicationTypeChanged; + + public event EventHandler BtsrYarnTypeChanged; + public event EventHandler MachineChanged; public event EventHandler> RmlExtensionTestWashingResultsChanged; @@ -961,6 +967,85 @@ namespace Tango.BL.Entities } } + protected String _btsrapplicationtypeguid; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr application type guid. + /// + + [Column("BTSR_APPLICATION_TYPE_GUID")] + [ForeignKey("BtsrApplicationType")] + + public String BtsrApplicationTypeGuid + { + get + { + return _btsrapplicationtypeguid; + } + + set + { + if (_btsrapplicationtypeguid != value) + { + _btsrapplicationtypeguid = value; + + } + } + } + + protected String _btsryarntypeguid; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr yarn type guid. + /// + + [Column("BTSR_YARN_TYPE_GUID")] + [ForeignKey("BtsrYarnType")] + + public String BtsrYarnTypeGuid + { + get + { + return _btsryarntypeguid; + } + + set + { + if (_btsryarntypeguid != value) + { + _btsryarntypeguid = value; + + } + } + } + + protected Double _btsrtensionerror; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr tension error. + /// + + [Column("BTSR_TENSION_ERROR")] + + public Double BtsrTensionError + { + get + { + return _btsrtensionerror; + } + + set + { + if (_btsrtensionerror != value) + { + _btsrtensionerror = value; + + OnBtsrTensionErrorChanged(value); + + } + } + } + protected RmlsExtension _rmlsextensions; /// @@ -1043,6 +1128,70 @@ namespace Tango.BL.Entities } } + protected BtsrApplicationType _btsrapplicationtype; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr application types. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual BtsrApplicationType BtsrApplicationType + { + get + { + return _btsrapplicationtype; + } + + set + { + if (_btsrapplicationtype != value) + { + _btsrapplicationtype = value; + + if (BtsrApplicationType != null) + { + BtsrApplicationTypeGuid = BtsrApplicationType.Guid; + } + + OnBtsrApplicationTypeChanged(value); + + } + } + } + + protected BtsrYarnType _btsryarntype; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr yarn types. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual BtsrYarnType BtsrYarnType + { + get + { + return _btsryarntype; + } + + set + { + if (_btsryarntype != value) + { + _btsryarntype = value; + + if (BtsrYarnType != null) + { + BtsrYarnTypeGuid = BtsrYarnType.Guid; + } + + OnBtsrYarnTypeChanged(value); + + } + } + } + protected Machine _machine; /// @@ -1395,6 +1544,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(ThreadLub)); } + /// + /// Called when the BtsrTensionError has changed. + /// + protected virtual void OnBtsrTensionErrorChanged(Double btsrtensionerror) + { + BtsrTensionErrorChanged?.Invoke(this, btsrtensionerror); + RaisePropertyChanged(nameof(BtsrTensionError)); + } + /// /// Called when the RmlsExtensions has changed. /// @@ -1422,6 +1580,24 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); } + /// + /// Called when the BtsrApplicationType has changed. + /// + protected virtual void OnBtsrApplicationTypeChanged(BtsrApplicationType btsrapplicationtype) + { + BtsrApplicationTypeChanged?.Invoke(this, btsrapplicationtype); + RaisePropertyChanged(nameof(BtsrApplicationType)); + } + + /// + /// Called when the BtsrYarnType has changed. + /// + protected virtual void OnBtsrYarnTypeChanged(BtsrYarnType btsryarntype) + { + BtsrYarnTypeChanged?.Invoke(this, btsryarntype); + RaisePropertyChanged(nameof(BtsrYarnType)); + } + /// /// Called when the Machine has changed. /// diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 259b2ce6b..ea2315046 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -116,6 +116,7 @@ + @@ -820,7 +821,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs index a4ebc4b0f..523980e37 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs @@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public BTSR_APPLICATION_TYPES() { + this.RML_EXTENSION_TEST_RESULTS = new HashSet(); this.RMLS = new HashSet(); } @@ -27,6 +28,8 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } public string DESCRIPTION { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RML_EXTENSION_TEST_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RMLS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs index 256af7baf..ef09f7498 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs @@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public BTSR_YARN_TYPES() { + this.RML_EXTENSION_TEST_RESULTS = new HashSet(); this.RMLS = new HashSet(); } @@ -27,6 +28,8 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } public string DESCRIPTION { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RML_EXTENSION_TEST_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RMLS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs index 7f25d41a2..1a1416100 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs @@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB public string RMLS_EXTENSIONS_GUID { get; set; } public string MACHINE_GUID { get; set; } - public virtual MACHINE MACHINE { get; set; } public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } + public virtual MACHINE MACHINE { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs index 55614d7a4..cca943272 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs @@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB public string RMLS_EXTENSIONS_GUID { get; set; } public string MACHINE_GUID { get; set; } - public virtual MACHINE MACHINE { get; set; } public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } + public virtual MACHINE MACHINE { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs index e0543a58c..e4bf0b029 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs @@ -58,12 +58,17 @@ namespace Tango.DAL.Remote.DB public string THREAD_LUB_VERSION { get; set; } public Nullable THREAD_COF { get; set; } public Nullable THREAD_LUB { get; set; } + public string BTSR_APPLICATION_TYPE_GUID { get; set; } + public string BTSR_YARN_TYPE_GUID { get; set; } + public double BTSR_TENSION_ERROR { get; set; } public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection TENSILE_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual BTSR_APPLICATION_TYPES BTSR_APPLICATION_TYPES { get; set; } + public virtual BTSR_YARN_TYPES BTSR_YARN_TYPES { get; set; } public virtual MACHINE MACHINE { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index eae61d93a..7f06dbc14 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1218,6 +1218,9 @@ + + + @@ -2821,6 +2824,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -3902,6 +3929,14 @@ + + + + + + + + @@ -4360,10 +4395,18 @@ + + + + + + + + @@ -4840,6 +4883,11 @@ + + + + + @@ -5579,6 +5627,7 @@ + @@ -5591,6 +5640,7 @@ + @@ -7203,6 +7253,18 @@ + + + + + + + + + + + + @@ -7215,6 +7277,18 @@ + + + + + + + + + + + + @@ -8524,6 +8598,9 @@ + + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index f5a974c53..ea228f323 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,100 +5,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.3.1 From ea4957385f2d1a3da2a3a6f5e0db95ca624c8173 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 1 Sep 2022 17:01:45 +0300 Subject: MS. RML Extension. Save White point. Related Work Items: #7130 --- .../ViewModels/ColorCalibrationViewVM.cs | 6 ++--- .../ViewModels/ColorCalibrationViewVM.cs | 4 ++-- .../ViewModels/ColorParametersVewVM.cs | 26 +++++++++++++++++----- .../ViewModels/MainViewVM.cs | 6 ++--- .../Views/ColorParametersView.xaml | 6 ++--- 5 files changed, 32 insertions(+), 16 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs index 30e17d6db..feee2637a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs @@ -100,9 +100,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels } - private void OnChangeSelectedRML() + private async void OnChangeSelectedRML() { - Invalidate(); + await Invalidate(); } #region RML @@ -113,7 +113,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels { IsFree = false; - await Task.Factory.StartNew(() => + await Task.Run(() => { using (_notification.PushTaskItem("Loading RML data...")) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorCalibrationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorCalibrationViewVM.cs index 2144d05f5..01c3b2d4f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorCalibrationViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorCalibrationViewVM.cs @@ -223,7 +223,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels /// /// Applies calibration points to RML. /// - private void ApplyToRML(object obj) + private async void ApplyToRML(object obj) { if(SelectedTab != null && ActiveRML != null) { @@ -232,7 +232,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels { IsFree = false; DateTime lastUpdated = DateTime.UtcNow; - var rml = new RmlBuilder(_active_context).Set(ActiveRML.Guid).WithLiquidFactors().Build(); + var rml = await new RmlBuilder(_active_context).Set(ActiveRML.Guid).WithLiquidFactors().BuildAsync(); if (rml != null) { var liquidTypesRmls = rml.LiquidTypesRmls; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs index 2ab1f81f1..d784c69a9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs @@ -209,7 +209,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels OnRMLExtensionGUIDChanged(); } } - + protected string _selectedMachineGuid; /// /// Gets or sets the selected machine. @@ -431,8 +431,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels _active_context = ObservablesContext.CreateDefault(); - await Task.Factory.StartNew(() => - { + await Task.Run(async () => + { using (_notification.PushTaskItem("Loading Color Process Parameters ...")) { @@ -441,6 +441,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels { SelectedColorProcessParameter = new ColorProcessParametersBuilder(_active_context).Set(currentcolorProcessParameter.Guid).WithColorProcessData().WithColorProcessFactor().WithColorProcessInkUptake().Build(); } + if (SelectedColorProcessParameter == null) { @@ -448,6 +449,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels SelectedColorProcessParameter.WhitePointL = 0.0; SelectedColorProcessParameter.WhitePointA = 0.0; SelectedColorProcessParameter.WhitePointB = 0.0; + + SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.CYAN, FactorPercent = 100, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }); SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.MAGENTA, FactorPercent = 100, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }); SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.YELLOW, FactorPercent = 100, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }); @@ -461,7 +464,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MININKUPTAKEZONE2, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }); SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MAXINKUPTAKEZONE2, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }); _active_context.ColorProcessParameters.Add(SelectedColorProcessParameter); - _active_context.SaveChangesAsync(); + await _active_context.SaveChangesAsync(); } else if(SelectedColorProcessParameter.ColorProcessInkUptake.Count == 0) { @@ -470,7 +473,13 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MININKUPTAKEZONE2, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }); SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MAXINKUPTAKEZONE2, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid }); } - + var rml = await new RmlBuilder(_active_context).Set(RMLGUID).BuildAsync(); + if (rml != null && SelectedColorProcessParameter != null) + { + SelectedColorProcessParameter.WhitePointL = rml.WhitePointL; + SelectedColorProcessParameter.WhitePointA = rml.WhitePointA; + SelectedColorProcessParameter.WhitePointB = rml.WhitePointB; + } } }); @@ -775,6 +784,13 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels IsFree = false; SelectedColorProcessParameter.LastUpdated = DateTime.UtcNow; + var rml = await new RmlBuilder(_active_context).Set(RMLGUID).BuildAsync(); + if (rml != null) + { + rml.WhitePointL = SelectedColorProcessParameter.WhitePointL; + rml.WhitePointA = SelectedColorProcessParameter.WhitePointA; + rml.WhitePointB = SelectedColorProcessParameter.WhitePointB; + } foreach (var item in RemovedColorProcessDataBeforeSave) { 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 b2f3d99cf..458bc913a 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 @@ -1069,11 +1069,11 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels - ActiveRML = new RmlBuilder(_active_context).Set(SelectedRMLExtension.RMLGuid).WithLiquidFactors().Build(); + ActiveRML = await new RmlBuilder(_active_context).Set(SelectedRMLExtension.RMLGuid).WithLiquidFactors().BuildAsync(); - ActiveRMLExtension = new RmlExtensionsBuilder(_active_context) + ActiveRMLExtension = await new RmlExtensionsBuilder(_active_context) .Set(guid) - .Build(); + .BuildAsync(); if (!String.IsNullOrEmpty(ActiveRML.Manufacturer) && false == Manufacturers.Any(x => x == ActiveRML.Manufacturer)) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml index 504bf0610..376392d89 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorParametersView.xaml @@ -335,13 +335,13 @@ White point - + - + - + -- cgit v1.3.1