Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

5 files changed, 26 insertions, 11 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 01def8679..40710ea21 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1709,12 +1709,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 try
                 {
-                    LogManager.Log(String.Format("Uploading process parameters table {0}...", SelectedProcessParametersTable.Name));
+                    LogManager.Log($"Uploading process parameters table {SelectedProcessParametersTable.Name}...");
                     await MachineOperator.UploadProcessParameters(SelectedProcessParametersTable);
                 }
                 catch (Exception ex)
                 {
-                    LogManager.LogFormat(ex, "Failed to upload process parameters table {0}", SelectedProcessParametersTable.Name);
+                    LogManager.Log(ex, $"Failed to upload process parameters table {SelectedProcessParametersTable.Name}");
                     _notification.ShowError("Failed to upload the selected process parameters." + Environment.NewLine + ex.Message);
                 }
             }
@@ -2189,7 +2189,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (ActiveJob != null)
             {
-                LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
+                LogManager.Log($"Adding new segment to job {ActiveJob.Name}...");
                 Segment seg = new Segment();
                 seg.Job = ActiveJob;
                 seg.Name = "SEGMENT";
@@ -2342,7 +2342,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (SelectedSegment != null)
             {
-                LogManager.LogFormat("Adding new brush stop to segment...", SelectedSegment.SegmentIndex.ToString());
+                LogManager.Log($"Adding new brush stop to segment '{SelectedSegment.SegmentIndex}'...");
 
                 var stop = new BrushStop();
 
@@ -2373,7 +2373,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         private void DuplicateSelectedBrushStops()
         {
-            LogManager.LogFormat("Duplicating {0} brush stops...", SelectedBrushStops.Count);
+            LogManager.Log($"Duplicating {SelectedBrushStops.Count} brush stops...");
 
             foreach (var stop in SelectedBrushStops.OrderBy(x => x.StopIndex))
             {
@@ -2391,7 +2391,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         private void DuplicateSelectedSegments()
         {
-            LogManager.LogFormat("Duplicating {0} segments...", SelectedSegments.Count);
+            LogManager.Log($"Duplicating {SelectedSegments.Count} segments...");
 
             int start_index = SelectedSegments.Max(x => x.SegmentIndex);
 
@@ -2419,7 +2419,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     CanWork = false;
 
-                    LogManager.LogFormat("Duplicating {0} jobs...", SelectedJobs.Count);
+                    LogManager.Log($"Duplicating {SelectedJobs.Count} jobs...");
 
                     int index = SelectedMachine.Jobs.Max(x => x.JobIndex);
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
index d9ba419e0..95de19f42 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
@@ -111,6 +111,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                 Color = x.LiquidType.Color,
                 Name = x.LiquidType.Name,
                 LiquidType = x.LiquidType,
+                MaxNanoliterPerCentimeter = x.MaxNlPerCm,
             }).ToObservableCollection();
         }
 
@@ -309,7 +310,7 @@ namespace Tango.MachineStudio.RML.ViewModels
             }
         }
 
-        private double GetTotalMaximumLiquidVolumeLimit()
+        private double GetTotalMaximumLiquidNlPerCMLimit()
         {
             try
             {
@@ -329,7 +330,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                 if (LiquidsCalibrationData == null || _prevent_inverse_conversion) return;
 
                 //TODO: This is temporary because of out of range volumes.
-                if (LiquidVolumes.Where(x => x.LiquidType.HasPigment).Sum(x => x.Volume) > GetTotalMaximumLiquidVolumeLimit())
+                if (LiquidVolumes.Where(x => x.LiquidType.HasPigment).Sum(x => x.NanoliterPerCentimeter) > GetTotalMaximumLiquidNlPerCMLimit())
                 {
                     IsVolumesOutOfRange = true;
                     return;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
index 7399d62af..27b811bb6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Dispensing;
 using Tango.BL.Entities;
 using Tango.Core;
 using Tango.SharedUI;
@@ -47,5 +48,17 @@ namespace Tango.MachineStudio.RML.ViewModels
             get { return _liquidType; }
             set { _liquidType = value; RaisePropertyChangedAuto(); }
         }
+
+        public double MaxNanoliterPerCentimeter { get; set; }
+
+        public double NanoliterPerCentimeter
+        {
+            get
+            {
+                StandardColorDispensingCalc calc = new StandardColorDispensingCalc();
+                return calc.CalculateNanoliterPerCentimeter(Volume, MaxNanoliterPerCentimeter);
+            }
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs
index 0691ca6bd..464599452 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs
@@ -13,7 +13,8 @@ namespace Tango.MachineStudio.UI.TFS
     {
         public IEnumerable GetSuggestions(string filter)
         {
-            return TangoIOC.Default.GetInstance<TeamFoundationServiceExtendedClient>().Project.Members.Where(x => x.AssignName.ToLower().Contains(filter.ToLower()));
+            var members = TangoIOC.Default.GetInstance<TeamFoundationServiceExtendedClient>().Project.Members;
+            return members.Where(x => x.AssignName.ToLower().Contains(filter.ToLower()));
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
index 302c50e8e..30b2c83fd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
@@ -97,7 +97,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     var jobRuns = await db.JobRuns.Where(x => x.MachineGuid == ApplicationManager.Machine.Guid).Select(x => new { x.StartDate, x.EndDate, x.EndPosition }).ToListAsync();
 
-                    TotalMachineWorkTime = TimeSpan.FromHours(jobRuns.Select(x => x.EndDate - x.StartDate).Sum(x => x.TotalHours)).ToString(@"hh\:mm\:ss");
+                    TotalMachineWorkTime = TimeSpan.FromHours(jobRuns.Select(x => x.EndDate - x.StartDate).Sum(x => x.TotalHours)).ToStringUnlimitedHours();
 
                     int meters = (int)jobRuns.Select(x => x.EndPosition).Sum();
                     TotalMachineMeters = $"{meters.ToString("N0")} meters";