diff options
| -rw-r--r-- | Software/DB/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/Tango_log.ldf | bin | 22675456 -> 22675456 bytes | |||
| -rw-r--r-- | Software/PMR/Messages/Printing/JobSpoolType.proto | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs | 6 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs | 8 |
5 files changed, 13 insertions, 3 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 3f091a567..89375b452 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex ddcf21a06..02456c382 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/PMR/Messages/Printing/JobSpoolType.proto b/Software/PMR/Messages/Printing/JobSpoolType.proto index ae567a91a..a88971af1 100644 --- a/Software/PMR/Messages/Printing/JobSpoolType.proto +++ b/Software/PMR/Messages/Printing/JobSpoolType.proto @@ -20,4 +20,6 @@ enum JobSpoolType HaAmma = 1; + FlatSpool = 2; + } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs index f02de31bb..d8064f7f3 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/SpoolTypes.cs @@ -31,5 +31,11 @@ namespace Tango.BL.Enumerations [Description("Standard Spool")] StandardSpool = 0, + /// <summary> + /// (Flat Spool) + /// </summary> + [Description("Flat Spool")] + FlatSpool = 2, + } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs index 4a677ab0c..74d94c131 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/JobSpoolType.cs @@ -22,9 +22,10 @@ namespace Tango.PMR.Printing { static JobSpoolTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChJKb2JTcG9vbFR5cGUucHJvdG8SElRhbmdvLlBNUi5QcmludGluZyotCgxK", - "b2JTcG9vbFR5cGUSEQoNU3RhbmRhcmRTcG9vbBAAEgoKBkhhQW1tYRABQh4K", - "HGNvbS50d2luZS50YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw==")); + "ChJKb2JTcG9vbFR5cGUucHJvdG8SElRhbmdvLlBNUi5QcmludGluZyo8CgxK", + "b2JTcG9vbFR5cGUSEQoNU3RhbmRhcmRTcG9vbBAAEgoKBkhhQW1tYRABEg0K", + "CUZsYXRTcG9vbBACQh4KHGNvbS50d2luZS50YW5nby5wbXIucHJpbnRpbmdi", + "BnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Printing.JobSpoolType), }, null)); @@ -36,6 +37,7 @@ namespace Tango.PMR.Printing { public enum JobSpoolType { [pbr::OriginalName("StandardSpool")] StandardSpool = 0, [pbr::OriginalName("HaAmma")] HaAmma = 1, + [pbr::OriginalName("FlatSpool")] FlatSpool = 2, } #endregion |