#5821 Save all changes in DB and loading data.

2 files changed, 12 insertions, 13 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/CalibrationPlotModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/CalibrationPlotModel.cs
index d6a7212c0..0f844097d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/CalibrationPlotModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/CalibrationPlotModel.cs
@@ -157,18 +157,14 @@ namespace Tango.MachineStudio.ThreadExtensions.Models
 
         public void InitDataGraph(List<ColorLinearizationModel.LinearizationDataItem> items)
         {
-            if (DataPlotControl == null)
-            {
-                Debug.WriteLine("ERROR!!!   CreateGraph. Plot Control is NULL.");
-                return;
-            }
-
             if (items == null || items.Count == 0)
                 return;
 
             ClearResults();
-            DataPlotControl.InvalidatePlot(true);
-            LinearizationPlotControl.InvalidatePlot(true);
+            if (DataPlotControl != null)
+                DataPlotControl.InvalidatePlot(true);
+            if (LinearizationPlotControl != null)
+                LinearizationPlotControl.InvalidatePlot(true);
             
             foreach (var labItem in items)
             {
@@ -181,16 +177,17 @@ namespace Tango.MachineStudio.ThreadExtensions.Models
             
             MinY = Math.Min(0, items.Min(x => Math.Min(x.L, Math.Min(x.A, x.B))));
             MaxY = Math.Max( 100, items.Max(x => Math.Max(x.L, Math.Max(x.A, x.B))));
-            
-            DataPlotControl.InvalidatePlot(true);
+
+            if (DataPlotControl != null)
+                DataPlotControl.InvalidatePlot(true);
         }
         
         public void InitLinearizationGraph(List<ColorLinearizationModel.LinearizationDataItem> items, List<double> outputPoints)
         {
-
             if (outputPoints == null)
                 return;
 
+            LinearizationPoints.Clear();
             foreach (var nw in items.Zip(outputPoints, Tuple.Create))
             {
                 LinearizationPoints.Add(new DataPoint(nw.Item1.InkPercentage, nw.Item2));
@@ -199,7 +196,10 @@ namespace Tango.MachineStudio.ThreadExtensions.Models
             LinearizationMaxX = Math.Max(100, LinearizationPoints.Max(x => x.X));
             LinearizationMaxY = Math.Max(100, LinearizationPoints.Max(x => x.Y));
 
-            LinearizationPlotControl.InvalidatePlot(true);
+            if (LinearizationPlotControl != null)
+            {
+                LinearizationPlotControl.InvalidatePlot(true);
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorLinearizationModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorLinearizationModel.cs
index 39774f7d8..148f0f416 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorLinearizationModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/ColorLinearizationModel.cs
@@ -37,7 +37,6 @@ namespace Tango.MachineStudio.ThreadExtensions.Models
             {
                 errors = ex.Message;
             }
-
         }
     }
 }