RML EXTANSION- item 5745, 5909, 5823. DataBase changes:

table Rubbing results , remove GS 100 min and  GS 100 max and add GS 100, remove GS 200 min and  GS 200 max and add GS 200. Created new table COLOR_PROCESS_INK_UPTAKE

4 files changed, 31 insertions, 43 deletions

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 2aa5598be..c60c65216 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
@@ -138,35 +138,18 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             }
         }
 
-        private ObservableCollection<ColorProcessFactor> _minInkUptake;
-        public ObservableCollection<ColorProcessFactor> MinInkUptake
-        {
-            get
-            {
-                return _minInkUptake;
-            }
-            set
-            {
-                _minInkUptake = value;
-                RaisePropertyChangedAuto();
-            }
-        }
 
-        private ObservableCollection<ColorProcessFactor> _maxInkUptake;
-        public ObservableCollection<ColorProcessFactor> MaxInkUptake
+        private ObservableCollection<ColorProcessInkUptake> _colorProcessInkUptakeData;
+
+        public ObservableCollection<ColorProcessInkUptake> ColorProcessInkUptakeData
         {
-            get
-            {
-                return _maxInkUptake;
-            }
-            set
-            {
-                _maxInkUptake = value;
+            get { return _colorProcessInkUptakeData; }
+            set {
+                _colorProcessInkUptakeData = value;
                 RaisePropertyChangedAuto();
             }
         }
-
-
+        
         private PlotProperties _cyanPlot;
 
         public PlotProperties CyanPlot
@@ -456,7 +439,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                     var currentcolorProcessParameter = _active_context.ColorProcessParameters.Where(x => x.RmlsExtensionsGuid == RMLExtemtionGUID && x.MachineGuid == SelectedMachineGUID).FirstOrDefault();
                     if (currentcolorProcessParameter != null)
                     {
-                        SelectedColorProcessParameter = new ColorProcessParametersBuilder(_active_context).Set(currentcolorProcessParameter.Guid).WithColorProcessData().WithColorProcessFactor().Build();
+                        SelectedColorProcessParameter = new ColorProcessParametersBuilder(_active_context).Set(currentcolorProcessParameter.Guid).WithColorProcessData().WithColorProcessFactor().WithColorProcessInkUptake().Build();
                     }
 
                     if (SelectedColorProcessParameter == null)
@@ -473,17 +456,20 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                         SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.MAGENTA, FactorPercent = 200, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
                         SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.YELLOW, FactorPercent = 200, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
                         SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.BLACK, FactorPercent = 200, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
-                        SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.CYAN, FactorPercent = 1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
-                        SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.MAGENTA, FactorPercent = 1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
-                        SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.YELLOW, FactorPercent = 1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
-                        SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.BLACK, FactorPercent = 1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
-                        SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.CYAN, FactorPercent = 1111, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
-                        SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.MAGENTA, FactorPercent = 1111, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
-                        SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.YELLOW, FactorPercent = 1111, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
-                        SelectedColorProcessParameter.ColorProcessFactors.Add(new ColorProcessFactor() { FactorColor = FactorColors.BLACK, FactorPercent = 1111, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MININKUPTAKEZONE1,  ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MAXINKUPTAKEZONE1,  ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        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();
                     }
+                    else if(SelectedColorProcessParameter.ColorProcessInkUptake.Count == 0)
+                    {
+                        SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MININKUPTAKEZONE1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MAXINKUPTAKEZONE1, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MININKUPTAKEZONE2, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                        SelectedColorProcessParameter.ColorProcessInkUptake.Add(new ColorProcessInkUptake() { InkUptakeZoneType = InkUptakeZoneTypes.MAXINKUPTAKEZONE2, ColorProcessParametersGuid = SelectedColorProcessParameter.Guid });
+                    }
 
                 }
             });
@@ -498,10 +484,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
             Factor200ProcessData = SelectedColorProcessParameter.ColorProcessFactors.Where(x => x.FactorPercent == 200).ToObservableCollection();
 
-            MinInkUptake = SelectedColorProcessParameter.ColorProcessFactors.Where(x => x.FactorPercent == 1).ToObservableCollection();
-
-            MaxInkUptake = SelectedColorProcessParameter.ColorProcessFactors.Where(x => x.FactorPercent == 1111).ToObservableCollection();
-
+            ColorProcessInkUptakeData = SelectedColorProcessParameter.ColorProcessInkUptake.ToObservableCollection();
+            
             RemovedColorProcessDataBeforeSave.Clear();
 
             var cyanDataList = SelectedColorProcessParameter.ColorProcessData.Where(x => x.FactorColor == FactorColors.CYAN).ToList().OrderBy(x => x.InkNlCm).ToList();
@@ -775,10 +759,14 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                 {
                     factordata.LastUpdated = DateTime.UtcNow;
                 }
+                foreach (var inkdata in SelectedColorProcessParameter.ColorProcessInkUptake)
+                {
+                    inkdata.LastUpdated = DateTime.UtcNow;
+                }
 
                 await _active_context.SaveChangesAsync();
                 
-                LoadColorParameters();
+               // LoadColorParameters();
             }
             catch (Exception ex)
             {
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 fc07a5903..12ae1aa89 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
@@ -794,10 +794,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
 
             AddManufacturerItemCommand = new RelayCommand(AddManufacturerItem);
-            EditManufacturerItemCommand = new RelayCommand(EditManufacturerItem, () => ActiveRML.Manufacturer != "");
+            EditManufacturerItemCommand = new RelayCommand(EditManufacturerItem, () => ActiveRML !=null && ActiveRML.Manufacturer != "");
 
             AddBrandItemCommand = new RelayCommand(AddBrandItem);
-            EditBrandItemCommand = new RelayCommand(EditBrandItem, () => ActiveRMLExtension.YarnBrand != null);
+            EditBrandItemCommand = new RelayCommand(EditBrandItem, () => ActiveRMLExtension != null && ActiveRMLExtension.YarnBrand != null);
 
             AddEndUseItemCommand = new RelayCommand(AddEndUseItem);
             EditEndUseItemCommand = new RelayCommand(EditEndUseItem);
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 4e7d84e7f..52182cdd7 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
@@ -142,11 +142,11 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                            //sb.Append("  DeltaE CIE 100 % : ");
                             sb.Append($"  { rubbingResult.DeltaeCie100.ToString()}  ");
                             //sb.Append("  GS 100% : ");
-                            sb.Append($"        { rubbingResult.Gs100Min.ToString()}-{rubbingResult.Gs100Max.ToString()}  ");
+                            sb.Append($"        { rubbingResult.Gs100.ToString()}  ");
                             //sb.Append("  DeltaE CIE 200 % : ");
                             sb.Append($"  { rubbingResult.DeltaeCie200.ToString()}  ");
                             //sb.Append("  GS 200% : ");
-                            sb.Append($"        { rubbingResult.Gs200Min.ToString()}-{rubbingResult.Gs200Max.ToString()}  ");
+                            sb.Append($"        { rubbingResult.Gs200.ToString()}  ");
                             outputFile.WriteLine(sb);  
                         }
                         outputFile.WriteLine("");
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 a94415c74..eea7eb9fc 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
@@ -386,7 +386,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                     _active_context.SaveChanges();
                 });
                
-                LoadTestResults();
+              //  LoadTestResults();
             }
             catch (Exception ex)
             {