merge

1 files changed, 4 insertions, 32 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Exports/JobFileBrushStop.cs b/Software/Visual_Studio/Tango.PMR/Exports/JobFileBrushStop.cs
index 2b4d84ac6..36da58b4e 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",
-            "Sm9iRmlsZUxpcXVpZFZvbHVtZS5wcm90byLrAgoQSm9iRmlsZUJydXNoU3Rv",
+            "Sm9iRmlsZUxpcXVpZFZvbHVtZS5wcm90byLUAgoQSm9iRmlsZUJydXNoU3Rv",
             "cBIWCg5Db2xvclNwYWNlR3VpZBgBIAEoCRIVCg1PZmZzZXRQZXJjZW50GAIg",
             "ASgBEgwKBEN5YW4YAyABKAESDwoHTWFnZW50YRgEIAEoARIOCgZZZWxsb3cY",
             "BSABKAESDQoFQmxhY2sYBiABKAESCwoDUmVkGAcgASgFEg0KBUdyZWVuGAgg",
@@ -31,12 +31,12 @@ namespace Tango.PMR.Exports {
             "DCABKAESPQoNTGlxdWlkVm9sdW1lcxgYIAMoCzImLlRhbmdvLlBNUi5FeHBv",
             "cnRzLkpvYkZpbGVMaXF1aWRWb2x1bWUSEQoJQ29ycmVjdGVkGBUgASgIEhgK",
             "EENvbG9yQ2F0YWxvZ0d1aWQYFiABKAkSHAoUQ29sb3JDYXRhbG9nSXRlbUd1",
-            "aWQYFyABKAkSFQoNSXNUcmFuc3BhcmVudBgZIAEoCEIdChtjb20udHdpbmUu",
-            "dGFuZ28ucG1yLmV4cG9ydHNiBnByb3RvMw=="));
+            "aWQYFyABKAlCHQobY29tLnR3aW5lLnRhbmdvLnBtci5leHBvcnRzYgZwcm90",
+            "bzM="));
       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" }, 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" }, null, null, null)
           }));
     }
     #endregion
@@ -83,7 +83,6 @@ namespace Tango.PMR.Exports {
       corrected_ = other.corrected_;
       colorCatalogGuid_ = other.colorCatalogGuid_;
       colorCatalogItemGuid_ = other.colorCatalogItemGuid_;
-      isTransparent_ = other.isTransparent_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -266,17 +265,6 @@ namespace Tango.PMR.Exports {
       }
     }
 
-    /// <summary>Field number for the "IsTransparent" field.</summary>
-    public const int IsTransparentFieldNumber = 25;
-    private bool isTransparent_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool IsTransparent {
-      get { return isTransparent_; }
-      set {
-        isTransparent_ = value;
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as JobFileBrushStop);
@@ -306,7 +294,6 @@ namespace Tango.PMR.Exports {
       if (Corrected != other.Corrected) return false;
       if (ColorCatalogGuid != other.ColorCatalogGuid) return false;
       if (ColorCatalogItemGuid != other.ColorCatalogItemGuid) return false;
-      if (IsTransparent != other.IsTransparent) return false;
       return true;
     }
 
@@ -329,7 +316,6 @@ namespace Tango.PMR.Exports {
       if (Corrected != false) hash ^= Corrected.GetHashCode();
       if (ColorCatalogGuid.Length != 0) hash ^= ColorCatalogGuid.GetHashCode();
       if (ColorCatalogItemGuid.Length != 0) hash ^= ColorCatalogItemGuid.GetHashCode();
-      if (IsTransparent != false) hash ^= IsTransparent.GetHashCode();
       return hash;
     }
 
@@ -401,10 +387,6 @@ namespace Tango.PMR.Exports {
         output.WriteString(ColorCatalogItemGuid);
       }
       liquidVolumes_.WriteTo(output, _repeated_liquidVolumes_codec);
-      if (IsTransparent != false) {
-        output.WriteRawTag(200, 1);
-        output.WriteBool(IsTransparent);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -456,9 +438,6 @@ namespace Tango.PMR.Exports {
       if (ColorCatalogItemGuid.Length != 0) {
         size += 2 + pb::CodedOutputStream.ComputeStringSize(ColorCatalogItemGuid);
       }
-      if (IsTransparent != false) {
-        size += 2 + 1;
-      }
       return size;
     }
 
@@ -513,9 +492,6 @@ namespace Tango.PMR.Exports {
       if (other.ColorCatalogItemGuid.Length != 0) {
         ColorCatalogItemGuid = other.ColorCatalogItemGuid;
       }
-      if (other.IsTransparent != false) {
-        IsTransparent = other.IsTransparent;
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -590,10 +566,6 @@ namespace Tango.PMR.Exports {
             liquidVolumes_.AddEntriesFrom(input, _repeated_liquidVolumes_codec);
             break;
           }
-          case 200: {
-            IsTransparent = input.ReadBool();
-            break;
-          }
         }
       }
     }