1 files changed, 15 insertions, 87 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs
index 8e314704d..b6ac9c9e1 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs
@@ -25,27 +25,23 @@ namespace Tango.PMR.Printing {
             "Cg9Kb2JUaWNrZXQucHJvdG8SElRhbmdvLlBNUi5QcmludGluZxoQSm9iU2Vn",
             "bWVudC5wcm90bxoXUHJvY2Vzc1BhcmFtZXRlcnMucHJvdG8aFkpvYldpbmRp",
             "bmdNZXRob2QucHJvdG8aDkpvYlNwb29sLnByb3RvGhdKb2JVcGxvYWRTdHJh",
-            "dGVneS5wcm90bxoWVGhyZWFkUGFyYW1ldGVycy5wcm90bxocSGVhZENsZWFu",
-            "aW5nUGFyYW1ldGVycy5wcm90byL9BAoJSm9iVGlja2V0EgwKBEd1aWQYASAB",
-            "KAkSDAoETmFtZRgCIAEoCRIaChJFbmFibGVJbnRlclNlZ21lbnQYAyABKAgS",
-            "GgoSSW50ZXJTZWdtZW50TGVuZ3RoGAQgASgBEg4KBkxlbmd0aBgFIAEoARJA",
-            "ChFQcm9jZXNzUGFyYW1ldGVycxgGIAEoCzIlLlRhbmdvLlBNUi5QcmludGlu",
-            "Zy5Qcm9jZXNzUGFyYW1ldGVycxI7Cg1XaW5kaW5nTWV0aG9kGAcgASgOMiQu",
-            "VGFuZ28uUE1SLlByaW50aW5nLkpvYldpbmRpbmdNZXRob2QSKwoFU3Bvb2wY",
-            "CCABKAsyHC5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU3Bvb2wSMAoIU2VnbWVu",
-            "dHMYCSADKAsyHi5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU2VnbWVudBI9Cg5V",
-            "cGxvYWRTdHJhdGVneRgKIAEoDjIlLlRhbmdvLlBNUi5QcmludGluZy5Kb2JV",
-            "cGxvYWRTdHJhdGVneRIaChJKb2JEZXNjcmlwdGlvbkZpbGUYCyABKAkSGQoR",
-            "RW5hYmxlTHVicmljYXRpb24YDCABKAgSFQoNTnVtYmVyT2ZVbml0cxgNIAEo",
-            "DRIVCg1TYW1wbGVXaW5kaW5nGA4gASgIEj4KEFRocmVhZFBhcmFtZXRlcnMY",
-            "DyABKAsyJC5UYW5nby5QTVIuUHJpbnRpbmcuVGhyZWFkUGFyYW1ldGVycxJK",
-            "ChZIZWFkQ2xlYW5pbmdQYXJhbWV0ZXJzGBAgASgLMiouVGFuZ28uUE1SLlBy",
-            "aW50aW5nLkhlYWRDbGVhbmluZ1BhcmFtZXRlcnNCHgocY29tLnR3aW5lLnRh",
-            "bmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
+            "dGVneS5wcm90byLxAwoJSm9iVGlja2V0EgwKBEd1aWQYASABKAkSDAoETmFt",
+            "ZRgCIAEoCRIaChJFbmFibGVJbnRlclNlZ21lbnQYAyABKAgSGgoSSW50ZXJT",
+            "ZWdtZW50TGVuZ3RoGAQgASgBEg4KBkxlbmd0aBgFIAEoARJAChFQcm9jZXNz",
+            "UGFyYW1ldGVycxgGIAEoCzIlLlRhbmdvLlBNUi5QcmludGluZy5Qcm9jZXNz",
+            "UGFyYW1ldGVycxI7Cg1XaW5kaW5nTWV0aG9kGAcgASgOMiQuVGFuZ28uUE1S",
+            "LlByaW50aW5nLkpvYldpbmRpbmdNZXRob2QSKwoFU3Bvb2wYCCABKAsyHC5U",
+            "YW5nby5QTVIuUHJpbnRpbmcuSm9iU3Bvb2wSMAoIU2VnbWVudHMYCSADKAsy",
+            "Hi5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU2VnbWVudBI9Cg5VcGxvYWRTdHJh",
+            "dGVneRgKIAEoDjIlLlRhbmdvLlBNUi5QcmludGluZy5Kb2JVcGxvYWRTdHJh",
+            "dGVneRIaChJKb2JEZXNjcmlwdGlvbkZpbGUYCyABKAkSGQoRRW5hYmxlTHVi",
+            "cmljYXRpb24YDCABKAgSFQoNTnVtYmVyT2ZVbml0cxgNIAEoDRIVCg1TYW1w",
+            "bGVXaW5kaW5nGA4gASgIQh4KHGNvbS50d2luZS50YW5nby5wbXIucHJpbnRp",
+            "bmdiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSegmentReflection.Descriptor, global::Tango.PMR.Printing.ProcessParametersReflection.Descriptor, global::Tango.PMR.Printing.JobWindingMethodReflection.Descriptor, global::Tango.PMR.Printing.JobSpoolReflection.Descriptor, global::Tango.PMR.Printing.JobUploadStrategyReflection.Descriptor, global::Tango.PMR.Printing.ThreadParametersReflection.Descriptor, global::Tango.PMR.Printing.HeadCleaningParametersReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSegmentReflection.Descriptor, global::Tango.PMR.Printing.ProcessParametersReflection.Descriptor, global::Tango.PMR.Printing.JobWindingMethodReflection.Descriptor, global::Tango.PMR.Printing.JobSpoolReflection.Descriptor, global::Tango.PMR.Printing.JobUploadStrategyReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobTicket), global::Tango.PMR.Printing.JobTicket.Parser, new[]{ "Guid", "Name", "EnableInterSegment", "InterSegmentLength", "Length", "ProcessParameters", "WindingMethod", "Spool", "Segments", "UploadStrategy", "JobDescriptionFile", "EnableLubrication", "NumberOfUnits", "SampleWinding", "ThreadParameters", "HeadCleaningParameters" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobTicket), global::Tango.PMR.Printing.JobTicket.Parser, new[]{ "Guid", "Name", "EnableInterSegment", "InterSegmentLength", "Length", "ProcessParameters", "WindingMethod", "Spool", "Segments", "UploadStrategy", "JobDescriptionFile", "EnableLubrication", "NumberOfUnits", "SampleWinding" }, null, null, null)
           }));
     }
     #endregion
@@ -90,8 +86,6 @@ namespace Tango.PMR.Printing {
       enableLubrication_ = other.enableLubrication_;
       numberOfUnits_ = other.numberOfUnits_;
       sampleWinding_ = other.sampleWinding_;
-      ThreadParameters = other.threadParameters_ != null ? other.ThreadParameters.Clone() : null;
-      HeadCleaningParameters = other.headCleaningParameters_ != null ? other.HeadCleaningParameters.Clone() : null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -255,28 +249,6 @@ namespace Tango.PMR.Printing {
       }
     }
 
-    /// <summary>Field number for the "ThreadParameters" field.</summary>
-    public const int ThreadParametersFieldNumber = 15;
-    private global::Tango.PMR.Printing.ThreadParameters threadParameters_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Printing.ThreadParameters ThreadParameters {
-      get { return threadParameters_; }
-      set {
-        threadParameters_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "HeadCleaningParameters" field.</summary>
-    public const int HeadCleaningParametersFieldNumber = 16;
-    private global::Tango.PMR.Printing.HeadCleaningParameters headCleaningParameters_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Printing.HeadCleaningParameters HeadCleaningParameters {
-      get { return headCleaningParameters_; }
-      set {
-        headCleaningParameters_ = value;
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as JobTicket);
@@ -304,8 +276,6 @@ namespace Tango.PMR.Printing {
       if (EnableLubrication != other.EnableLubrication) return false;
       if (NumberOfUnits != other.NumberOfUnits) return false;
       if (SampleWinding != other.SampleWinding) return false;
-      if (!object.Equals(ThreadParameters, other.ThreadParameters)) return false;
-      if (!object.Equals(HeadCleaningParameters, other.HeadCleaningParameters)) return false;
       return true;
     }
 
@@ -326,8 +296,6 @@ namespace Tango.PMR.Printing {
       if (EnableLubrication != false) hash ^= EnableLubrication.GetHashCode();
       if (NumberOfUnits != 0) hash ^= NumberOfUnits.GetHashCode();
       if (SampleWinding != false) hash ^= SampleWinding.GetHashCode();
-      if (threadParameters_ != null) hash ^= ThreadParameters.GetHashCode();
-      if (headCleaningParameters_ != null) hash ^= HeadCleaningParameters.GetHashCode();
       return hash;
     }
 
@@ -391,14 +359,6 @@ namespace Tango.PMR.Printing {
         output.WriteRawTag(112);
         output.WriteBool(SampleWinding);
       }
-      if (threadParameters_ != null) {
-        output.WriteRawTag(122);
-        output.WriteMessage(ThreadParameters);
-      }
-      if (headCleaningParameters_ != null) {
-        output.WriteRawTag(130, 1);
-        output.WriteMessage(HeadCleaningParameters);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -444,12 +404,6 @@ namespace Tango.PMR.Printing {
       if (SampleWinding != false) {
         size += 1 + 1;
       }
-      if (threadParameters_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ThreadParameters);
-      }
-      if (headCleaningParameters_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(HeadCleaningParameters);
-      }
       return size;
     }
 
@@ -504,18 +458,6 @@ namespace Tango.PMR.Printing {
       if (other.SampleWinding != false) {
         SampleWinding = other.SampleWinding;
       }
-      if (other.threadParameters_ != null) {
-        if (threadParameters_ == null) {
-          threadParameters_ = new global::Tango.PMR.Printing.ThreadParameters();
-        }
-        ThreadParameters.MergeFrom(other.ThreadParameters);
-      }
-      if (other.headCleaningParameters_ != null) {
-        if (headCleaningParameters_ == null) {
-          headCleaningParameters_ = new global::Tango.PMR.Printing.HeadCleaningParameters();
-        }
-        HeadCleaningParameters.MergeFrom(other.HeadCleaningParameters);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -588,20 +530,6 @@ namespace Tango.PMR.Printing {
             SampleWinding = input.ReadBool();
             break;
           }
-          case 122: {
-            if (threadParameters_ == null) {
-              threadParameters_ = new global::Tango.PMR.Printing.ThreadParameters();
-            }
-            input.ReadMessage(threadParameters_);
-            break;
-          }
-          case 130: {
-            if (headCleaningParameters_ == null) {
-              headCleaningParameters_ = new global::Tango.PMR.Printing.HeadCleaningParameters();
-            }
-            input.ReadMessage(headCleaningParameters_);
-            break;
-          }
         }
       }
     }