software merge.

6 files changed, 25 insertions, 19 deletions

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 d37fe1aaa..30e17d6db 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
@@ -87,11 +87,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         #endregion
 
-        public ColorCalibrationViewVM(INotificationProvider notification, Machine machine, ObservablesContext context)
+        public ColorCalibrationViewVM(INotificationProvider notification, Machine machine, ObservablesContext context, Rml rml)
         {
             _notification = notification;
             _machine = machine;
             _dbContext = context;
+            _selectedRML = rml;
         }
 
         private void OnChangeCalibrationDataViewVM()
@@ -106,7 +107,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         #region RML
 
-        public async void Invalidate()
+        public async Task Invalidate()
         {
             if (SelectedRML != null && Machine != null)
             {
@@ -173,7 +174,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 };
             }
         }
-        
+
         #endregion
 
         #region Save
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 0f439c83d..e3547c568 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -623,13 +623,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                     SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid);
 
-                    ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, ActiveMachine, _activeMachineAdapter.Context)
+                    ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, ActiveMachine, _activeMachineAdapter.Context, ActiveMachineAdapter.Rmls.FirstOrDefault())
                     {
                         Rmls = ActiveMachineAdapter.Rmls,
                         LiquidTypesRmls = ActiveMachineAdapter.Rmls.FirstOrDefault().LiquidTypesRmls,
-                        SelectedRML = ActiveMachineAdapter.Rmls.FirstOrDefault(),
                     };
 
+                    await ColorCalibrationViewVM.Invalidate();
+
                     if (initHwConfig)
                     {
                         HardwareConfigurationViewVM = new HardwareConfigurationViewVM(_notification);
@@ -844,7 +845,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         await SelectedMachine.Reload(MachinesAdapter.Context);
                     }
 
-                    ColorCalibrationViewVM.Invalidate();
+                    await ColorCalibrationViewVM.Invalidate();
                 }
             }
             catch (Exception ex)
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index 57c3c9f34..2d6ffeb04 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -310,7 +310,7 @@ namespace Tango.PPC.Common.MachineUpdate
             _isUpdating = false;
         }
 
-        private async void OnCompleted(MachineUpdateResult result, TaskCompletionSource<MachineUpdateResult> completionSource, DownloadUpdateResponse response, String tempDbName, String backupsFolder, Core.DataSource localDataSource, PublishInfo tupPublishInfo = null)
+        private async void OnCompleted(MachineUpdateResult result, TaskCompletionSource<MachineUpdateResult> completionSource, DownloadUpdateResponse response, String tempDbName, String backupsFolder, Core.DataSource localDataSource, PublishInfo tupPublishInfo = null, bool deleteBackupsFolder = false)
         {
             await Task.Factory.StartNew(() =>
             {
@@ -332,14 +332,17 @@ namespace Tango.PPC.Common.MachineUpdate
                     }
                 }
 
-                //try
-                //{
-                //    Directory.Delete(backupsFolder, true);
-                //}
-                //catch (Exception ex)
-                //{
-                //    LogManager.Log(ex, $"Error deleting backups folder '{backupsFolder}'.");
-                //}
+                if (deleteBackupsFolder)
+                {
+                    try
+                    {
+                        Directory.Delete(backupsFolder, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, $"Error deleting backups folder '{backupsFolder}'.");
+                    }
+                }
 
                 if (!result.RequiresBinariesUpdate)
                 {
@@ -1469,7 +1472,7 @@ namespace Tango.PPC.Common.MachineUpdate
                         {
                             UpdatePackagePath = _newPackageTempFolder,
                             RequiresBinariesUpdate = replaceBinaries,
-                        }, result, null, tempDbName, backupsFolder, localDataSource, publishInfo);
+                        }, result, null, tempDbName, backupsFolder, localDataSource, publishInfo, true);
                     };
                     handler.Canceled += (_, __) =>
                     {
@@ -1487,7 +1490,7 @@ namespace Tango.PPC.Common.MachineUpdate
                     {
                         UpdatePackagePath = _newPackageTempFolder,
                         RequiresBinariesUpdate = replaceBinaries,
-                    }, result, null, tempDbName, backupsFolder, localDataSource, publishInfo);
+                    }, result, null, tempDbName, backupsFolder, localDataSource, publishInfo, true);
                 }
             }
             catch (Exception ex)
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 38cf3efd8..66858dbf6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index d72e75011..efc5f8179 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs b/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs
index e77085945..395f9e826 100644
--- a/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs
+++ b/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs
@@ -352,6 +352,7 @@ namespace Tango.BL.Helpers
                                 }
                                 BrushStop stop2 = new BrushStop();
                                 stop2.StopIndex = 2;
+                                stop2.ColorSpace = stop1.ColorSpace;
                                 stop2.ColorCatalog = catalog2;
                                 stop2.ColorCatalogsItem = item2;
                                 stop2.Color = item2.Color;