From 50a315f968e2ff8b07a2c5a100ecb7151af9e484 Mon Sep 17 00:00:00 2001 From: Artem Tsybulko Date: Fri, 13 Jun 2025 12:56:42 +0300 Subject: [PATCH] SP-18211 - update models --- .openapi-generator/FILES | 1 - .../Model/DocVisualExtendedField.cs | 2 +- .../Model/EncryptedRCLItem.cs | 2 +- .../Model/EncryptedRCLResult.cs | 2 +- .../Model/LicenseItem.cs | 2 +- .../Model/LicenseResult.cs | 2 +- .../Model/MRZPositionResult.cs | 4 +- .../Model/MRZTestQuality.cs | 74 +++--- .../Model/MrzPosition.cs | 242 ------------------ .../Model/MrzPositionItem.cs | 4 +- .../Model/RFIDDocVisualExtendedField.cs | 2 +- .../Model/RfidDataFileType.cs | 8 +- .../Model/StringItem.cs | 92 +++---- .../Model/VisualExtendedFieldItem.cs | 14 +- 14 files changed, 104 insertions(+), 347 deletions(-) delete mode 100644 src/Regula.DocumentReader.WebClient/Model/MrzPosition.cs diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index a2d21ce..afe3d4e 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -134,7 +134,6 @@ src/Regula.DocumentReader.WebClient/Model/MRZTestQualityItem.cs src/Regula.DocumentReader.WebClient/Model/MRZTestQualityResult.cs src/Regula.DocumentReader.WebClient/Model/MeasureSystem.cs src/Regula.DocumentReader.WebClient/Model/MrzDetectModeEnum.cs -src/Regula.DocumentReader.WebClient/Model/MrzPosition.cs src/Regula.DocumentReader.WebClient/Model/MrzPositionItem.cs src/Regula.DocumentReader.WebClient/Model/OCRSecurityTextItem.cs src/Regula.DocumentReader.WebClient/Model/OCRSecurityTextResult.cs diff --git a/src/Regula.DocumentReader.WebClient/Model/DocVisualExtendedField.cs b/src/Regula.DocumentReader.WebClient/Model/DocVisualExtendedField.cs index 5b93771..4c51768 100644 --- a/src/Regula.DocumentReader.WebClient/Model/DocVisualExtendedField.cs +++ b/src/Regula.DocumentReader.WebClient/Model/DocVisualExtendedField.cs @@ -53,7 +53,7 @@ protected DocVisualExtendedField() { } /// wLCID. /// reserved2. /// reserved3. - public DocVisualExtendedField(RectangleCoordinates fieldRect = default(RectangleCoordinates), TextFieldType wFieldType = default(TextFieldType), string fieldName = default(string), decimal stringsCount = default(decimal), List stringsResult = default(List), decimal bufLength = default(decimal), string bufText = default(string), string fieldMask = default(string), int validity = default(int), int inComparison = default(int), int wLCID = default(int), int reserved2 = default(int), int reserved3 = default(int)) : base(wFieldType, fieldName, stringsCount, stringsResult, bufLength, bufText, fieldMask, validity, inComparison, wLCID, reserved2, reserved3) + public DocVisualExtendedField(RectangleCoordinates fieldRect = default(RectangleCoordinates), TextFieldType wFieldType = default(TextFieldType), string fieldName = default(string), decimal stringsCount = default(decimal), List stringsResult = default(List), decimal bufLength = default(decimal), string bufText = default(string), string fieldMask = default(string), int validity = default(int), int inComparison = default(int), LCID? wLCID = default(LCID?), int reserved2 = default(int), int reserved3 = default(int)) : base(wFieldType, fieldName, stringsCount, stringsResult, bufLength, bufText, fieldMask, validity, inComparison, wLCID, reserved2, reserved3) { // to ensure "fieldRect" is required (not null) if (fieldRect == null) diff --git a/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs b/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs index c0f8597..fd328d9 100644 --- a/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs +++ b/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs @@ -56,7 +56,7 @@ protected EncryptedRCLItem() { } /// /// Base64 encoded data /* - [B@5022ed18 + [B@671e627 */ [DataMember(Name = "EncryptedRCL", IsRequired = true, EmitDefaultValue = true)] public byte[] EncryptedRCL { get; set; } diff --git a/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs b/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs index b852d68..6b1944e 100644 --- a/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs +++ b/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs @@ -62,7 +62,7 @@ protected EncryptedRCLResult() { } /// /// Base64 encoded data /* - [B@5022ed18 + [B@671e627 */ [DataMember(Name = "EncryptedRCL", IsRequired = true, EmitDefaultValue = true)] public byte[] EncryptedRCL { get; set; } diff --git a/src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs b/src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs index 91f5422..acd6e24 100644 --- a/src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs +++ b/src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs @@ -56,7 +56,7 @@ protected LicenseItem() { } /// /// Base64 encoded data /* - [B@77df6449 + [B@3768c9b */ [DataMember(Name = "License", IsRequired = true, EmitDefaultValue = true)] public byte[] License { get; set; } diff --git a/src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs b/src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs index 44ec665..64171c0 100644 --- a/src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs +++ b/src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs @@ -62,7 +62,7 @@ protected LicenseResult() { } /// /// Base64 encoded data /* - [B@77df6449 + [B@3768c9b */ [DataMember(Name = "License", IsRequired = true, EmitDefaultValue = true)] public byte[] License { get; set; } diff --git a/src/Regula.DocumentReader.WebClient/Model/MRZPositionResult.cs b/src/Regula.DocumentReader.WebClient/Model/MRZPositionResult.cs index ed9564a..da83ae4 100644 --- a/src/Regula.DocumentReader.WebClient/Model/MRZPositionResult.cs +++ b/src/Regula.DocumentReader.WebClient/Model/MRZPositionResult.cs @@ -47,7 +47,7 @@ protected MRZPositionResult() { } /// listIdx. /// pageIdx. /// resultType (required) (default to Result.MRZ_POSITION). - public MRZPositionResult(MrzPosition mrzPosition = default(MrzPosition), int bufLength = default(int), int light = default(int), int listIdx = default(int), int pageIdx = default(int), Result resultType = Result.MRZ_POSITION) : base(bufLength, light, listIdx, pageIdx, resultType) + public MRZPositionResult(DocumentPosition mrzPosition = default(DocumentPosition), int bufLength = default(int), int light = default(int), int listIdx = default(int), int pageIdx = default(int), Result resultType = Result.MRZ_POSITION) : base(bufLength, light, listIdx, pageIdx, resultType) { // to ensure "mrzPosition" is required (not null) if (mrzPosition == null) @@ -61,7 +61,7 @@ protected MRZPositionResult() { } /// Gets or Sets MrzPosition /// [DataMember(Name = "MrzPosition", IsRequired = true, EmitDefaultValue = true)] - public MrzPosition MrzPosition { get; set; } + public DocumentPosition MrzPosition { get; set; } /// /// Returns the string presentation of the object diff --git a/src/Regula.DocumentReader.WebClient/Model/MRZTestQuality.cs b/src/Regula.DocumentReader.WebClient/Model/MRZTestQuality.cs index cdeea69..5b24eea 100644 --- a/src/Regula.DocumentReader.WebClient/Model/MRZTestQuality.cs +++ b/src/Regula.DocumentReader.WebClient/Model/MRZTestQuality.cs @@ -32,6 +32,42 @@ namespace Regula.DocumentReader.WebClient.Model [DataContract(Name = "MRZTestQuality")] public partial class MRZTestQuality : IValidatableObject { + + /// + /// Gets or Sets CHECK_SUMS + /// + [DataMember(Name = "CHECK_SUMS", IsRequired = true, EmitDefaultValue = true)] + public CheckResult CHECK_SUMS { get; set; } + + /// + /// Gets or Sets CONTRAST_PRINT + /// + [DataMember(Name = "CONTRAST_PRINT", IsRequired = true, EmitDefaultValue = true)] + public CheckResult CONTRAST_PRINT { get; set; } + + /// + /// Gets or Sets PRINT_POSITION + /// + [DataMember(Name = "PRINT_POSITION", IsRequired = true, EmitDefaultValue = true)] + public CheckResult PRINT_POSITION { get; set; } + + /// + /// Gets or Sets STAIN_MRZ + /// + [DataMember(Name = "STAIN_MRZ", IsRequired = true, EmitDefaultValue = true)] + public CheckResult STAIN_MRZ { get; set; } + + /// + /// Gets or Sets SYMBOLS_PARAM + /// + [DataMember(Name = "SYMBOLS_PARAM", IsRequired = true, EmitDefaultValue = true)] + public CheckResult SYMBOLS_PARAM { get; set; } + + /// + /// Gets or Sets TEXTUAL_FILLING + /// + [DataMember(Name = "TEXTUAL_FILLING", IsRequired = true, EmitDefaultValue = true)] + public CheckResult TEXTUAL_FILLING { get; set; } /// /// Initializes a new instance of the class. /// @@ -50,7 +86,7 @@ protected MRZTestQuality() { } /// strCount (required). /// strings (required). /// tEXTUALFILLING (required). - public MRZTestQuality(int cHECKSUMS = default(int), int cONTRASTPRINT = default(int), int dOCFORMAT = default(int), int mRZFORMAT = default(int), int pRINTPOSITION = default(int), int sTAINMRZ = default(int), int sYMBOLSPARAM = default(int), int strCount = default(int), List strings = default(List), int tEXTUALFILLING = default(int)) + public MRZTestQuality(CheckResult cHECKSUMS = default(CheckResult), CheckResult cONTRASTPRINT = default(CheckResult), int dOCFORMAT = default(int), int mRZFORMAT = default(int), CheckResult pRINTPOSITION = default(CheckResult), CheckResult sTAINMRZ = default(CheckResult), CheckResult sYMBOLSPARAM = default(CheckResult), int strCount = default(int), List strings = default(List), CheckResult tEXTUALFILLING = default(CheckResult)) { this.CHECK_SUMS = cHECKSUMS; this.CONTRAST_PRINT = cONTRASTPRINT; @@ -69,18 +105,6 @@ protected MRZTestQuality() { } this.TEXTUAL_FILLING = tEXTUALFILLING; } - /// - /// Gets or Sets CHECK_SUMS - /// - [DataMember(Name = "CHECK_SUMS", IsRequired = true, EmitDefaultValue = true)] - public int CHECK_SUMS { get; set; } - - /// - /// Gets or Sets CONTRAST_PRINT - /// - [DataMember(Name = "CONTRAST_PRINT", IsRequired = true, EmitDefaultValue = true)] - public int CONTRAST_PRINT { get; set; } - /// /// Gets or Sets DOC_FORMAT /// @@ -93,24 +117,6 @@ protected MRZTestQuality() { } [DataMember(Name = "MRZ_FORMAT", IsRequired = true, EmitDefaultValue = true)] public int MRZ_FORMAT { get; set; } - /// - /// Gets or Sets PRINT_POSITION - /// - [DataMember(Name = "PRINT_POSITION", IsRequired = true, EmitDefaultValue = true)] - public int PRINT_POSITION { get; set; } - - /// - /// Gets or Sets STAIN_MRZ - /// - [DataMember(Name = "STAIN_MRZ", IsRequired = true, EmitDefaultValue = true)] - public int STAIN_MRZ { get; set; } - - /// - /// Gets or Sets SYMBOLS_PARAM - /// - [DataMember(Name = "SYMBOLS_PARAM", IsRequired = true, EmitDefaultValue = true)] - public int SYMBOLS_PARAM { get; set; } - /// /// Gets or Sets StrCount /// @@ -123,12 +129,6 @@ protected MRZTestQuality() { } [DataMember(Name = "Strings", IsRequired = true, EmitDefaultValue = true)] public List Strings { get; set; } - /// - /// Gets or Sets TEXTUAL_FILLING - /// - [DataMember(Name = "TEXTUAL_FILLING", IsRequired = true, EmitDefaultValue = true)] - public int TEXTUAL_FILLING { get; set; } - /// /// Returns the string presentation of the object /// diff --git a/src/Regula.DocumentReader.WebClient/Model/MrzPosition.cs b/src/Regula.DocumentReader.WebClient/Model/MrzPosition.cs deleted file mode 100644 index 9890be7..0000000 --- a/src/Regula.DocumentReader.WebClient/Model/MrzPosition.cs +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Regula Document Reader Web API - * - * Documents recognition as easy as reading two bytes. # Clients: * [JavaScript](https://github.com/regulaforensics/DocumentReader-web-js-client) client for the browser and node.js based on axios * [Java](https://github.com/regulaforensics/DocumentReader-web-java-client) client compatible with jvm and android * [Python](https://github.com/regulaforensics/DocumentReader-web-python-client) 3.5+ client * [C#](https://github.com/regulaforensics/DocumentReader-web-csharp-client) client for .NET & .NET Core - * - * The version of the OpenAPI document: 8.1.0 - * Generated by: https://github.com/openapitools/openapi-generator.git - */ - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; -using System.ComponentModel.DataAnnotations; -using FileParameter = Regula.DocumentReader.WebClient.Client.FileParameter; -using OpenAPIDateConverter = Regula.DocumentReader.WebClient.Client.OpenAPIDateConverter; - -namespace Regula.DocumentReader.WebClient.Model -{ - /// - /// MrzPosition - /// - [DataContract(Name = "MrzPosition")] - public partial class MrzPosition : IValidatableObject - { - - /// - /// Gets or Sets DocFormat - /// - [DataMember(Name = "docFormat", IsRequired = true, EmitDefaultValue = true)] - public DocumentFormat DocFormat { get; set; } - /// - /// Initializes a new instance of the class. - /// - [JsonConstructorAttribute] - protected MrzPosition() { } - /// - /// Initializes a new instance of the class. - /// - /// docFormat (required). - /// Document rotation angle (required). - /// Document width (required). - /// Document height (required). - /// center (required). - /// leftBottom (required). - /// leftTop (required). - /// rightBottom (required). - /// rightTop (required). - /// dpi (required). - /// inverse. - /// objArea. - /// objIntAngleDev. - /// perspectiveTr. - /// resultStatus. - public MrzPosition(DocumentFormat docFormat = default(DocumentFormat), decimal angle = default(decimal), int width = default(int), int height = default(int), Point center = default(Point), Point leftBottom = default(Point), Point leftTop = default(Point), Point rightBottom = default(Point), Point rightTop = default(Point), int dpi = default(int), int inverse = default(int), int objArea = default(int), int objIntAngleDev = default(int), int perspectiveTr = default(int), int resultStatus = default(int)) - { - this.DocFormat = docFormat; - this.Angle = angle; - this.Width = width; - this.Height = height; - // to ensure "center" is required (not null) - if (center == null) - { - throw new ArgumentNullException("center is a required property for MrzPosition and cannot be null"); - } - this.Center = center; - // to ensure "leftBottom" is required (not null) - if (leftBottom == null) - { - throw new ArgumentNullException("leftBottom is a required property for MrzPosition and cannot be null"); - } - this.LeftBottom = leftBottom; - // to ensure "leftTop" is required (not null) - if (leftTop == null) - { - throw new ArgumentNullException("leftTop is a required property for MrzPosition and cannot be null"); - } - this.LeftTop = leftTop; - // to ensure "rightBottom" is required (not null) - if (rightBottom == null) - { - throw new ArgumentNullException("rightBottom is a required property for MrzPosition and cannot be null"); - } - this.RightBottom = rightBottom; - // to ensure "rightTop" is required (not null) - if (rightTop == null) - { - throw new ArgumentNullException("rightTop is a required property for MrzPosition and cannot be null"); - } - this.RightTop = rightTop; - this.Dpi = dpi; - this.Inverse = inverse; - this.ObjArea = objArea; - this.ObjIntAngleDev = objIntAngleDev; - this.PerspectiveTr = perspectiveTr; - this.ResultStatus = resultStatus; - } - - /// - /// Document rotation angle - /// - /// Document rotation angle - [DataMember(Name = "Angle", IsRequired = true, EmitDefaultValue = true)] - public decimal Angle { get; set; } - - /// - /// Document width - /// - /// Document width - [DataMember(Name = "Width", IsRequired = true, EmitDefaultValue = true)] - public int Width { get; set; } - - /// - /// Document height - /// - /// Document height - [DataMember(Name = "Height", IsRequired = true, EmitDefaultValue = true)] - public int Height { get; set; } - - /// - /// Gets or Sets Center - /// - [DataMember(Name = "Center", IsRequired = true, EmitDefaultValue = true)] - public Point Center { get; set; } - - /// - /// Gets or Sets LeftBottom - /// - [DataMember(Name = "LeftBottom", IsRequired = true, EmitDefaultValue = true)] - public Point LeftBottom { get; set; } - - /// - /// Gets or Sets LeftTop - /// - [DataMember(Name = "LeftTop", IsRequired = true, EmitDefaultValue = true)] - public Point LeftTop { get; set; } - - /// - /// Gets or Sets RightBottom - /// - [DataMember(Name = "RightBottom", IsRequired = true, EmitDefaultValue = true)] - public Point RightBottom { get; set; } - - /// - /// Gets or Sets RightTop - /// - [DataMember(Name = "RightTop", IsRequired = true, EmitDefaultValue = true)] - public Point RightTop { get; set; } - - /// - /// Gets or Sets Dpi - /// - [DataMember(Name = "Dpi", IsRequired = true, EmitDefaultValue = true)] - public int Dpi { get; set; } - - /// - /// Gets or Sets Inverse - /// - [DataMember(Name = "Inverse", EmitDefaultValue = false)] - public int? Inverse { get; set; } - - /// - /// Gets or Sets ObjArea - /// - [DataMember(Name = "ObjArea", EmitDefaultValue = false)] - public int? ObjArea { get; set; } - - /// - /// Gets or Sets ObjIntAngleDev - /// - [DataMember(Name = "ObjIntAngleDev", EmitDefaultValue = false)] - public int? ObjIntAngleDev { get; set; } - - /// - /// Gets or Sets PerspectiveTr - /// - [DataMember(Name = "PerspectiveTr", EmitDefaultValue = false)] - public int? PerspectiveTr { get; set; } - - /// - /// Gets or Sets ResultStatus - /// - [DataMember(Name = "ResultStatus", EmitDefaultValue = false)] - public int? ResultStatus { get; set; } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - sb.Append("class MrzPosition {\n"); - sb.Append(" DocFormat: ").Append(DocFormat).Append("\n"); - sb.Append(" Angle: ").Append(Angle).Append("\n"); - sb.Append(" Width: ").Append(Width).Append("\n"); - sb.Append(" Height: ").Append(Height).Append("\n"); - sb.Append(" Center: ").Append(Center).Append("\n"); - sb.Append(" LeftBottom: ").Append(LeftBottom).Append("\n"); - sb.Append(" LeftTop: ").Append(LeftTop).Append("\n"); - sb.Append(" RightBottom: ").Append(RightBottom).Append("\n"); - sb.Append(" RightTop: ").Append(RightTop).Append("\n"); - sb.Append(" Dpi: ").Append(Dpi).Append("\n"); - sb.Append(" Inverse: ").Append(Inverse).Append("\n"); - sb.Append(" ObjArea: ").Append(ObjArea).Append("\n"); - sb.Append(" ObjIntAngleDev: ").Append(ObjIntAngleDev).Append("\n"); - sb.Append(" PerspectiveTr: ").Append(PerspectiveTr).Append("\n"); - sb.Append(" ResultStatus: ").Append(ResultStatus).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public virtual string ToJson() - { - return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); - } - - /// - /// To validate all properties of the instance - /// - /// Validation context - /// Validation Result - IEnumerable IValidatableObject.Validate(ValidationContext validationContext) - { - yield break; - } - } - -} diff --git a/src/Regula.DocumentReader.WebClient/Model/MrzPositionItem.cs b/src/Regula.DocumentReader.WebClient/Model/MrzPositionItem.cs index 14e5003..e7592ec 100644 --- a/src/Regula.DocumentReader.WebClient/Model/MrzPositionItem.cs +++ b/src/Regula.DocumentReader.WebClient/Model/MrzPositionItem.cs @@ -41,7 +41,7 @@ protected MrzPositionItem() { } /// Initializes a new instance of the class. /// /// mrzPosition (required). - public MrzPositionItem(MrzPosition mrzPosition = default(MrzPosition)) + public MrzPositionItem(DocumentPosition mrzPosition = default(DocumentPosition)) { // to ensure "mrzPosition" is required (not null) if (mrzPosition == null) @@ -55,7 +55,7 @@ protected MrzPositionItem() { } /// Gets or Sets MrzPosition /// [DataMember(Name = "MrzPosition", IsRequired = true, EmitDefaultValue = true)] - public MrzPosition MrzPosition { get; set; } + public DocumentPosition MrzPosition { get; set; } /// /// Returns the string presentation of the object diff --git a/src/Regula.DocumentReader.WebClient/Model/RFIDDocVisualExtendedField.cs b/src/Regula.DocumentReader.WebClient/Model/RFIDDocVisualExtendedField.cs index 4b83536..47ff6a7 100644 --- a/src/Regula.DocumentReader.WebClient/Model/RFIDDocVisualExtendedField.cs +++ b/src/Regula.DocumentReader.WebClient/Model/RFIDDocVisualExtendedField.cs @@ -56,7 +56,7 @@ protected RFIDDocVisualExtendedField() { } /// wLCID. /// reserved2. /// reserved3. - public RFIDDocVisualExtendedField(int originDG = default(int), int originDGTag = default(int), decimal originTagEntry = default(decimal), int originEntryView = default(int), TextFieldType wFieldType = default(TextFieldType), string fieldName = default(string), decimal stringsCount = default(decimal), List stringsResult = default(List), decimal bufLength = default(decimal), string bufText = default(string), string fieldMask = default(string), int validity = default(int), int inComparison = default(int), int wLCID = default(int), int reserved2 = default(int), int reserved3 = default(int)) : base(wFieldType, fieldName, stringsCount, stringsResult, bufLength, bufText, fieldMask, validity, inComparison, wLCID, reserved2, reserved3) + public RFIDDocVisualExtendedField(int originDG = default(int), int originDGTag = default(int), decimal originTagEntry = default(decimal), int originEntryView = default(int), TextFieldType wFieldType = default(TextFieldType), string fieldName = default(string), decimal stringsCount = default(decimal), List stringsResult = default(List), decimal bufLength = default(decimal), string bufText = default(string), string fieldMask = default(string), int validity = default(int), int inComparison = default(int), LCID? wLCID = default(LCID?), int reserved2 = default(int), int reserved3 = default(int)) : base(wFieldType, fieldName, stringsCount, stringsResult, bufLength, bufText, fieldMask, validity, inComparison, wLCID, reserved2, reserved3) { this.OriginDG = originDG; this.OriginTagEntry = originTagEntry; diff --git a/src/Regula.DocumentReader.WebClient/Model/RfidDataFileType.cs b/src/Regula.DocumentReader.WebClient/Model/RfidDataFileType.cs index bf663e2..3ba86ee 100644 --- a/src/Regula.DocumentReader.WebClient/Model/RfidDataFileType.cs +++ b/src/Regula.DocumentReader.WebClient/Model/RfidDataFileType.cs @@ -413,14 +413,14 @@ public enum RfidDataFileType DIR = 401, /// - /// Enum _E_SIGN_PK for value: 500 + /// Enum E_SIGN_PK for value: 500 /// - _E_SIGN_PK = 500, + E_SIGN_PK = 500, /// - /// Enum _E_SIGN_SIGNED_DATA for value: 501 + /// Enum E_SIGN_SIGNED_DATA for value: 501 /// - _E_SIGN_SIGNED_DATA = 501, + E_SIGN_SIGNED_DATA = 501, /// /// Enum CERTIFICATE for value: 600 diff --git a/src/Regula.DocumentReader.WebClient/Model/StringItem.cs b/src/Regula.DocumentReader.WebClient/Model/StringItem.cs index 6a6ff4d..d4a2a7e 100644 --- a/src/Regula.DocumentReader.WebClient/Model/StringItem.cs +++ b/src/Regula.DocumentReader.WebClient/Model/StringItem.cs @@ -32,6 +32,48 @@ namespace Regula.DocumentReader.WebClient.Model [DataContract(Name = "StringItem")] public partial class StringItem : IValidatableObject { + + /// + /// Gets or Sets ALIGNMENT_SYMBOLS_IN_STRING + /// + [DataMember(Name = "ALIGNMENT_SYMBOLS_IN_STRING", IsRequired = true, EmitDefaultValue = true)] + public CheckResult ALIGNMENT_SYMBOLS_IN_STRING { get; set; } + + /// + /// Gets or Sets CHECK_SUMS + /// + [DataMember(Name = "CHECK_SUMS", IsRequired = true, EmitDefaultValue = true)] + public CheckResult CHECK_SUMS { get; set; } + + /// + /// Gets or Sets STRINGS_DISTANCE + /// + [DataMember(Name = "STRINGS_DISTANCE", IsRequired = true, EmitDefaultValue = true)] + public CheckResult STRINGS_DISTANCE { get; set; } + + /// + /// Gets or Sets STRINGS_INTERVAL + /// + [DataMember(Name = "STRINGS_INTERVAL", IsRequired = true, EmitDefaultValue = true)] + public CheckResult STRINGS_INTERVAL { get; set; } + + /// + /// Gets or Sets STRING_FILLING + /// + [DataMember(Name = "STRING_FILLING", IsRequired = true, EmitDefaultValue = true)] + public CheckResult STRING_FILLING { get; set; } + + /// + /// Gets or Sets STRINGS_POSITION + /// + [DataMember(Name = "STRINGS_POSITION", EmitDefaultValue = false)] + public CheckResult? STRINGS_POSITION { get; set; } + + /// + /// Gets or Sets SYMBOLS_PARAM + /// + [DataMember(Name = "SYMBOLS_PARAM", IsRequired = true, EmitDefaultValue = true)] + public CheckResult SYMBOLS_PARAM { get; set; } /// /// Initializes a new instance of the class. /// @@ -48,7 +90,7 @@ protected StringItem() { } /// sTRINGSDISTANCE (required). /// sTRINGSINTERVAL (required). /// sTRINGFILLING (required). - /// sTRINGPOSITION (required). + /// sTRINGSPOSITION. /// sYMBOLSPARAM (required). /// sizeErrorALIGNMENT (required). /// sizeErrorDISTANCE (required). @@ -57,7 +99,7 @@ protected StringItem() { } /// stringBorders (required). /// symbolsCount (required). /// symbolsEstimations (required). - public StringItem(int aLIGNMENTSYMBOLSINSTRING = default(int), int cHECKSUMS = default(int), ErrorCoordinates errorPOSITION = default(ErrorCoordinates), int fieldCount = default(int), List fields = default(List), int sTRINGSDISTANCE = default(int), int sTRINGSINTERVAL = default(int), int sTRINGFILLING = default(int), int sTRINGPOSITION = default(int), int sYMBOLSPARAM = default(int), decimal sizeErrorALIGNMENT = default(decimal), decimal sizeErrorDISTANCE = default(decimal), decimal sizeErrorINTERVAL = default(decimal), decimal stringAngle = default(decimal), RectangleCoordinates stringBorders = default(RectangleCoordinates), int symbolsCount = default(int), List symbolsEstimations = default(List)) + public StringItem(CheckResult aLIGNMENTSYMBOLSINSTRING = default(CheckResult), CheckResult cHECKSUMS = default(CheckResult), ErrorCoordinates errorPOSITION = default(ErrorCoordinates), int fieldCount = default(int), List fields = default(List), CheckResult sTRINGSDISTANCE = default(CheckResult), CheckResult sTRINGSINTERVAL = default(CheckResult), CheckResult sTRINGFILLING = default(CheckResult), CheckResult? sTRINGSPOSITION = default(CheckResult?), CheckResult sYMBOLSPARAM = default(CheckResult), decimal sizeErrorALIGNMENT = default(decimal), decimal sizeErrorDISTANCE = default(decimal), decimal sizeErrorINTERVAL = default(decimal), decimal stringAngle = default(decimal), RectangleCoordinates stringBorders = default(RectangleCoordinates), int symbolsCount = default(int), List symbolsEstimations = default(List)) { this.ALIGNMENT_SYMBOLS_IN_STRING = aLIGNMENTSYMBOLSINSTRING; this.CHECK_SUMS = cHECKSUMS; @@ -77,7 +119,6 @@ protected StringItem() { } this.STRINGS_DISTANCE = sTRINGSDISTANCE; this.STRINGS_INTERVAL = sTRINGSINTERVAL; this.STRING_FILLING = sTRINGFILLING; - this.STRING_POSITION = sTRINGPOSITION; this.SYMBOLS_PARAM = sYMBOLSPARAM; this.SizeErrorALIGNMENT = sizeErrorALIGNMENT; this.SizeErrorDISTANCE = sizeErrorDISTANCE; @@ -96,20 +137,9 @@ protected StringItem() { } throw new ArgumentNullException("symbolsEstimations is a required property for StringItem and cannot be null"); } this.SymbolsEstimations = symbolsEstimations; + this.STRINGS_POSITION = sTRINGSPOSITION; } - /// - /// Gets or Sets ALIGNMENT_SYMBOLS_IN_STRING - /// - [DataMember(Name = "ALIGNMENT_SYMBOLS_IN_STRING", IsRequired = true, EmitDefaultValue = true)] - public int ALIGNMENT_SYMBOLS_IN_STRING { get; set; } - - /// - /// Gets or Sets CHECK_SUMS - /// - [DataMember(Name = "CHECK_SUMS", IsRequired = true, EmitDefaultValue = true)] - public int CHECK_SUMS { get; set; } - /// /// Gets or Sets ErrorPOSITION /// @@ -128,36 +158,6 @@ protected StringItem() { } [DataMember(Name = "Fields", IsRequired = true, EmitDefaultValue = true)] public List Fields { get; set; } - /// - /// Gets or Sets STRINGS_DISTANCE - /// - [DataMember(Name = "STRINGS_DISTANCE", IsRequired = true, EmitDefaultValue = true)] - public int STRINGS_DISTANCE { get; set; } - - /// - /// Gets or Sets STRINGS_INTERVAL - /// - [DataMember(Name = "STRINGS_INTERVAL", IsRequired = true, EmitDefaultValue = true)] - public int STRINGS_INTERVAL { get; set; } - - /// - /// Gets or Sets STRING_FILLING - /// - [DataMember(Name = "STRING_FILLING", IsRequired = true, EmitDefaultValue = true)] - public int STRING_FILLING { get; set; } - - /// - /// Gets or Sets STRING_POSITION - /// - [DataMember(Name = "STRING_POSITION", IsRequired = true, EmitDefaultValue = true)] - public int STRING_POSITION { get; set; } - - /// - /// Gets or Sets SYMBOLS_PARAM - /// - [DataMember(Name = "SYMBOLS_PARAM", IsRequired = true, EmitDefaultValue = true)] - public int SYMBOLS_PARAM { get; set; } - /// /// Gets or Sets SizeErrorALIGNMENT /// @@ -216,7 +216,7 @@ public override string ToString() sb.Append(" STRINGS_DISTANCE: ").Append(STRINGS_DISTANCE).Append("\n"); sb.Append(" STRINGS_INTERVAL: ").Append(STRINGS_INTERVAL).Append("\n"); sb.Append(" STRING_FILLING: ").Append(STRING_FILLING).Append("\n"); - sb.Append(" STRING_POSITION: ").Append(STRING_POSITION).Append("\n"); + sb.Append(" STRINGS_POSITION: ").Append(STRINGS_POSITION).Append("\n"); sb.Append(" SYMBOLS_PARAM: ").Append(SYMBOLS_PARAM).Append("\n"); sb.Append(" SizeErrorALIGNMENT: ").Append(SizeErrorALIGNMENT).Append("\n"); sb.Append(" SizeErrorDISTANCE: ").Append(SizeErrorDISTANCE).Append("\n"); diff --git a/src/Regula.DocumentReader.WebClient/Model/VisualExtendedFieldItem.cs b/src/Regula.DocumentReader.WebClient/Model/VisualExtendedFieldItem.cs index 52277bf..8dc44f8 100644 --- a/src/Regula.DocumentReader.WebClient/Model/VisualExtendedFieldItem.cs +++ b/src/Regula.DocumentReader.WebClient/Model/VisualExtendedFieldItem.cs @@ -38,6 +38,12 @@ public partial class VisualExtendedFieldItem : IValidatableObject /// [DataMember(Name = "wFieldType", IsRequired = true, EmitDefaultValue = true)] public TextFieldType WFieldType { get; set; } + + /// + /// Gets or Sets WLCID + /// + [DataMember(Name = "wLCID", EmitDefaultValue = false)] + public LCID? WLCID { get; set; } /// /// Initializes a new instance of the class. /// @@ -58,7 +64,7 @@ protected VisualExtendedFieldItem() { } /// wLCID. /// reserved2. /// reserved3. - public VisualExtendedFieldItem(TextFieldType wFieldType = default(TextFieldType), string fieldName = default(string), decimal stringsCount = default(decimal), List stringsResult = default(List), decimal bufLength = default(decimal), string bufText = default(string), string fieldMask = default(string), int validity = default(int), int inComparison = default(int), int wLCID = default(int), int reserved2 = default(int), int reserved3 = default(int)) + public VisualExtendedFieldItem(TextFieldType wFieldType = default(TextFieldType), string fieldName = default(string), decimal stringsCount = default(decimal), List stringsResult = default(List), decimal bufLength = default(decimal), string bufText = default(string), string fieldMask = default(string), int validity = default(int), int inComparison = default(int), LCID? wLCID = default(LCID?), int reserved2 = default(int), int reserved3 = default(int)) { this.WFieldType = wFieldType; // to ensure "fieldName" is required (not null) @@ -142,12 +148,6 @@ protected VisualExtendedFieldItem() { } [DataMember(Name = "InComparison", EmitDefaultValue = false)] public int? InComparison { get; set; } - /// - /// Gets or Sets WLCID - /// - [DataMember(Name = "wLCID", EmitDefaultValue = false)] - public int? WLCID { get; set; } - /// /// Gets or Sets Reserved2 ///