FSE Stats Module.

Extended job run structure.
CSV export.

2 files changed, 121 insertions, 6 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Exports/JobFileBrushStop.cs b/Software/Visual_Studio/Tango.PMR/Exports/JobFileBrushStop.cs
index 308057cbb..f5b5278c7 100644
--- a/Software/Visual_Studio/Tango.PMR/Exports/JobFileBrushStop.cs
+++ b/Software/Visual_Studio/Tango.PMR/Exports/JobFileBrushStop.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Exports {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChZKb2JGaWxlQnJ1c2hTdG9wLnByb3RvEhFUYW5nby5QTVIuRXhwb3J0cxoZ",
-            "Sm9iRmlsZUxpcXVpZFZvbHVtZS5wcm90byL+AgoQSm9iRmlsZUJydXNoU3Rv",
+            "Sm9iRmlsZUxpcXVpZFZvbHVtZS5wcm90byK6AwoQSm9iRmlsZUJydXNoU3Rv",
             "cBIWCg5Db2xvclNwYWNlR3VpZBgBIAEoCRIVCg1PZmZzZXRQZXJjZW50GAIg",
             "ASgBEgwKBEN5YW4YAyABKAESDwoHTWFnZW50YRgEIAEoARIOCgZZZWxsb3cY",
             "BSABKAESDQoFQmxhY2sYBiABKAESCwoDUmVkGAcgASgFEg0KBUdyZWVuGAgg",
@@ -32,11 +32,13 @@ namespace Tango.PMR.Exports {
             "cnRzLkpvYkZpbGVMaXF1aWRWb2x1bWUSEQoJQ29ycmVjdGVkGBUgASgIEhgK",
             "EENvbG9yQ2F0YWxvZ0d1aWQYFiABKAkSHAoUQ29sb3JDYXRhbG9nSXRlbUd1",
             "aWQYFyABKAkSFQoNSXNUcmFuc3BhcmVudBgZIAEoCBIRCglTdG9wSW5kZXgY",
-            "GiABKAVCHQobY29tLnR3aW5lLnRhbmdvLnBtci5leHBvcnRzYgZwcm90bzM="));
+            "GiABKAUSEgoKQmVzdE1hdGNoUhgbIAEoBRISCgpCZXN0TWF0Y2hHGBwgASgF",
+            "EhIKCkJlc3RNYXRjaEIYHSABKAVCHQobY29tLnR3aW5lLnRhbmdvLnBtci5l",
+            "eHBvcnRzYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Exports.JobFileLiquidVolumeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Exports.JobFileBrushStop), global::Tango.PMR.Exports.JobFileBrushStop.Parser, new[]{ "ColorSpaceGuid", "OffsetPercent", "Cyan", "Magenta", "Yellow", "Black", "Red", "Green", "Blue", "L", "A", "B", "LiquidVolumes", "Corrected", "ColorCatalogGuid", "ColorCatalogItemGuid", "IsTransparent", "StopIndex" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Exports.JobFileBrushStop), global::Tango.PMR.Exports.JobFileBrushStop.Parser, new[]{ "ColorSpaceGuid", "OffsetPercent", "Cyan", "Magenta", "Yellow", "Black", "Red", "Green", "Blue", "L", "A", "B", "LiquidVolumes", "Corrected", "ColorCatalogGuid", "ColorCatalogItemGuid", "IsTransparent", "StopIndex", "BestMatchR", "BestMatchG", "BestMatchB" }, null, null, null)
           }));
     }
     #endregion
@@ -85,6 +87,9 @@ namespace Tango.PMR.Exports {
       colorCatalogItemGuid_ = other.colorCatalogItemGuid_;
       isTransparent_ = other.isTransparent_;
       stopIndex_ = other.stopIndex_;
+      bestMatchR_ = other.bestMatchR_;
+      bestMatchG_ = other.bestMatchG_;
+      bestMatchB_ = other.bestMatchB_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -289,6 +294,39 @@ namespace Tango.PMR.Exports {
       }
     }
 
+    /// <summary>Field number for the "BestMatchR" field.</summary>
+    public const int BestMatchRFieldNumber = 27;
+    private int bestMatchR_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int BestMatchR {
+      get { return bestMatchR_; }
+      set {
+        bestMatchR_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "BestMatchG" field.</summary>
+    public const int BestMatchGFieldNumber = 28;
+    private int bestMatchG_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int BestMatchG {
+      get { return bestMatchG_; }
+      set {
+        bestMatchG_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "BestMatchB" field.</summary>
+    public const int BestMatchBFieldNumber = 29;
+    private int bestMatchB_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int BestMatchB {
+      get { return bestMatchB_; }
+      set {
+        bestMatchB_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as JobFileBrushStop);
@@ -320,6 +358,9 @@ namespace Tango.PMR.Exports {
       if (ColorCatalogItemGuid != other.ColorCatalogItemGuid) return false;
       if (IsTransparent != other.IsTransparent) return false;
       if (StopIndex != other.StopIndex) return false;
+      if (BestMatchR != other.BestMatchR) return false;
+      if (BestMatchG != other.BestMatchG) return false;
+      if (BestMatchB != other.BestMatchB) return false;
       return true;
     }
 
@@ -344,6 +385,9 @@ namespace Tango.PMR.Exports {
       if (ColorCatalogItemGuid.Length != 0) hash ^= ColorCatalogItemGuid.GetHashCode();
       if (IsTransparent != false) hash ^= IsTransparent.GetHashCode();
       if (StopIndex != 0) hash ^= StopIndex.GetHashCode();
+      if (BestMatchR != 0) hash ^= BestMatchR.GetHashCode();
+      if (BestMatchG != 0) hash ^= BestMatchG.GetHashCode();
+      if (BestMatchB != 0) hash ^= BestMatchB.GetHashCode();
       return hash;
     }
 
@@ -423,6 +467,18 @@ namespace Tango.PMR.Exports {
         output.WriteRawTag(208, 1);
         output.WriteInt32(StopIndex);
       }
+      if (BestMatchR != 0) {
+        output.WriteRawTag(216, 1);
+        output.WriteInt32(BestMatchR);
+      }
+      if (BestMatchG != 0) {
+        output.WriteRawTag(224, 1);
+        output.WriteInt32(BestMatchG);
+      }
+      if (BestMatchB != 0) {
+        output.WriteRawTag(232, 1);
+        output.WriteInt32(BestMatchB);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -480,6 +536,15 @@ namespace Tango.PMR.Exports {
       if (StopIndex != 0) {
         size += 2 + pb::CodedOutputStream.ComputeInt32Size(StopIndex);
       }
+      if (BestMatchR != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(BestMatchR);
+      }
+      if (BestMatchG != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(BestMatchG);
+      }
+      if (BestMatchB != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(BestMatchB);
+      }
       return size;
     }
 
@@ -540,6 +605,15 @@ namespace Tango.PMR.Exports {
       if (other.StopIndex != 0) {
         StopIndex = other.StopIndex;
       }
+      if (other.BestMatchR != 0) {
+        BestMatchR = other.BestMatchR;
+      }
+      if (other.BestMatchG != 0) {
+        BestMatchG = other.BestMatchG;
+      }
+      if (other.BestMatchB != 0) {
+        BestMatchB = other.BestMatchB;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -622,6 +696,18 @@ namespace Tango.PMR.Exports {
             StopIndex = input.ReadInt32();
             break;
           }
+          case 216: {
+            BestMatchR = input.ReadInt32();
+            break;
+          }
+          case 224: {
+            BestMatchG = input.ReadInt32();
+            break;
+          }
+          case 232: {
+            BestMatchB = input.ReadInt32();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Printing/StartHeadCleaningRequest.cs b/Software/Visual_Studio/Tango.PMR/Printing/StartHeadCleaningRequest.cs
index d04dd4e66..71f8fbc49 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/StartHeadCleaningRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/StartHeadCleaningRequest.cs
@@ -23,12 +23,13 @@ namespace Tango.PMR.Printing {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Ch5TdGFydEhlYWRDbGVhbmluZ1JlcXVlc3QucHJvdG8SElRhbmdvLlBNUi5Q",
-            "cmludGluZyIaChhTdGFydEhlYWRDbGVhbmluZ1JlcXVlc3RCHgocY29tLnR3",
-            "aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
+            "cmludGluZyItChhTdGFydEhlYWRDbGVhbmluZ1JlcXVlc3QSEQoJSXNMb25n",
+            "Sm9iGAEgASgIQh4KHGNvbS50d2luZS50YW5nby5wbXIucHJpbnRpbmdiBnBy",
+            "b3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.StartHeadCleaningRequest), global::Tango.PMR.Printing.StartHeadCleaningRequest.Parser, null, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.StartHeadCleaningRequest), global::Tango.PMR.Printing.StartHeadCleaningRequest.Parser, new[]{ "IsLongJob" }, null, null, null)
           }));
     }
     #endregion
@@ -59,6 +60,7 @@ namespace Tango.PMR.Printing {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public StartHeadCleaningRequest(StartHeadCleaningRequest other) : this() {
+      isLongJob_ = other.isLongJob_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -66,6 +68,17 @@ namespace Tango.PMR.Printing {
       return new StartHeadCleaningRequest(this);
     }
 
+    /// <summary>Field number for the "IsLongJob" field.</summary>
+    public const int IsLongJobFieldNumber = 1;
+    private bool isLongJob_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool IsLongJob {
+      get { return isLongJob_; }
+      set {
+        isLongJob_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as StartHeadCleaningRequest);
@@ -79,12 +92,14 @@ namespace Tango.PMR.Printing {
       if (ReferenceEquals(other, this)) {
         return true;
       }
+      if (IsLongJob != other.IsLongJob) return false;
       return true;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
+      if (IsLongJob != false) hash ^= IsLongJob.GetHashCode();
       return hash;
     }
 
@@ -95,11 +110,18 @@ namespace Tango.PMR.Printing {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
+      if (IsLongJob != false) {
+        output.WriteRawTag(8);
+        output.WriteBool(IsLongJob);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
+      if (IsLongJob != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -108,6 +130,9 @@ namespace Tango.PMR.Printing {
       if (other == null) {
         return;
       }
+      if (other.IsLongJob != false) {
+        IsLongJob = other.IsLongJob;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -118,6 +143,10 @@ namespace Tango.PMR.Printing {
           default:
             input.SkipLastField();
             break;
+          case 8: {
+            IsLongJob = input.ReadBool();
+            break;
+          }
         }
       }
     }