Updated events table.

Some color conversion fixes.

6 files changed, 16 insertions, 22 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
index 0e40e0d6a..078296f27 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
@@ -160,9 +160,12 @@ namespace Tango.PPC.Jobs.ViewModels
                 try
                 {
                     IColorConverter _converter = new DefaultColorConverter();
-                    EstimatedDuration = Job.GetEstimatedDuration(_converter.GetRecommendedProcessParameters(Job));
+                    EstimatedDuration = Job.GetEstimatedDuration(_converter.GetRecommendedProcessParameters(Job, true));
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error calculating recommended process parameters.");
                 }
-                catch { }
             });
 
             IsPreparingJob = false;
diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev29.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev29.xlsx
new file mode 100644
index 000000000..e78198d81
--- /dev/null
+++ b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev29.xlsx
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index cf82131b8..90310c201 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -419,9 +419,8 @@ namespace Tango.ColorConversion
 
         public ProcessParametersTable GetRecommendedProcessParameters(Job job, ProcessParametersTablesGroup group, bool useLightInks = false)
         {
-            //return GetRecommendedProcessParametersByGamutRegion(job, group);
-            //TODO: Use GetRecommendedProcessParameters(RecommendedProcessTableInput input, int version)
-            var stops = job.Segments.SelectMany(x => x.BrushStops).ToList();//Where(x => x.BrushColorSpace != ColorSpaces.Catalog)
+            var stops = job.Segments.SelectMany(x => x.BrushStops).ToList();
+
             if (stops.Count == 0)
             {
                 throw new ArgumentOutOfRangeException("THe number of brush stops cannot be zero.");
@@ -483,12 +482,14 @@ namespace Tango.ColorConversion
                 }
                 else if (stop.BrushColorSpace == ColorSpaces.Volume)
                 {
-                    foreach (var liquidVolume in stop.LiquidVolumesOrderedPigmented)
+                    var idsPacks = configuration.GetSupportedIdsPacks(rml);
+
+                    foreach (var idsPack in idsPacks.Where(x => !x.IsEmpty).Where(x => x.LiquidType != null && x.LiquidType.HasPigment).OrderBy(x => x.LiquidType.PreferredIndex))
                     {
                         istop.LiquidVolumes.Add(new PMR.ColorLab.LiquidVolume()
                         {
-                            LiquidType = (PMR.ColorLab.LiquidType)liquidVolume.LiquidType,
-                            Volume = liquidVolume.Volume
+                            LiquidType = (PMR.ColorLab.LiquidType)idsPack.LiquidType.Type,
+                            Volume = stop.GetVolume(idsPack.PackIndex),
                         });
                     }
                 }
@@ -536,12 +537,6 @@ namespace Tango.ColorConversion
             RecommendedProcessTableOutput output = GetRecommendedProcessParameters(input, rml.ColorConversionVersion);
 
             var maxIndex = output.ProcessParametersTableIndex;
-            //var catalogBrushStops = job.Segments.SelectMany(x => x.BrushStops).Where(x => x.BrushColorSpace == ColorSpaces.Catalog);
-            //if(catalogBrushStops.Count() > 0)
-            //{
-            //    var catalogIndex = catalogBrushStops.Max(x => x.ColorCatalogsItem.ProcessParametersTableIndex);
-            //    maxIndex = Math.Max(output.ProcessParametersTableIndex, catalogIndex);
-            //}
 
             var processTable = group.ProcessParametersTables.FirstOrDefault(x => x.TableIndex == maxIndex);
 
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index c2517608d..748f9e727 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -2435,7 +2435,7 @@ namespace Tango.Integration.Operation
 
                 try
                 {
-                    processParameters = converter.GetRecommendedProcessParameters(job);
+                    processParameters = converter.GetRecommendedProcessParameters(job, true);
                 }
                 catch (Exception ex)
                 {
diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
index 1486dc0d3..cf69e09d0 100644
--- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
@@ -16,7 +16,7 @@ namespace Tango.EventsTypesGenerator
 {
     class Program
     {
-        private static string EVENTS_FILE = "Tango alarm events handling chart_Rev29_draft_6.xlsx";
+        private static string EVENTS_FILE = "Tango alarm events handling chart_Rev29.xlsx";
 
         private class ExcelEventType
         {
diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj
index a7c10ce6c..ae34917fa 100644
--- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj
@@ -56,12 +56,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Resources\Events Revisions\Tango alarm events handling chart_Rev28.xlsx">
-      <Link>Tango alarm events handling chart_Rev28.xlsx</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Resources\Events Revisions\Tango alarm events handling chart_Rev29_draft_6.xlsx">
-      <Link>Tango alarm events handling chart_Rev29_draft_6.xlsx</Link>
+    <None Include="..\..\Resources\Events Revisions\Tango alarm events handling chart_Rev29.xlsx">
+      <Link>Tango alarm events handling chart_Rev29.xlsx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="App.config" />