1 files changed, 25 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index e3c128cb7..db0d7e2aa 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -348,9 +348,33 @@ namespace Tango.MachineStudio.RML.ViewModels
             BatchConversionCommand = new RelayCommand(BatchConversion);
         }
 
-        public override void OnApplicationReady()
+        public override async void OnApplicationReady()
         {
+            using (_notification.PushTaskItem("Loading color measurements..."))
+            {
+                using (var db = ObservablesContext.CreateDefault())
+                {
+                    var measurements = await db.ColorMeasurements.ToListAsync();
 
+                    List<PMR.ColorLab.ColorMeasurement> pmrMeasurements = new List<PMR.ColorLab.ColorMeasurement>();
+                    foreach (var m in measurements)
+                    {
+                        pmrMeasurements.Add(new PMR.ColorLab.ColorMeasurement()
+                        {
+                            C = m.C,
+                            M = m.M,
+                            Y = m.Y,
+                            K = m.K,
+                            V = m.V,
+                            L = m.L,
+                            A = m.A,
+                            B = m.B,
+                        });
+                    }
+
+                    DefaultColorConverter.SetMeasurements(pmrMeasurements);
+                }
+            }
         }
 
         private async Task LoadRmls()