FileVersion and FileRevision read correctly from XDD

Author: Giannis Roussos

libEDSsharp/CanOpenXDD_1_1.cs

@@ -1214,6 +1214,27 @@ private string G_label_getDescription(object[] items) {
             return "";
         }
 
+        private void GetEDSFileInfo (EDSsharp eds )
+        {
+            string[] nums = eds.fi.fileVersionString.Split('.');
+            if (nums.Length == 2)
+            {
+                byte.TryParse(nums[0], out eds.fi.FileVersion);
+                byte.TryParse(nums[1], out eds.fi.FileRevision);
+            }
+        }
+        private UInt32 U32Parse(string str)
+        {
+            if (str.Trim().ToLower().StartsWith("0x"))
+            {
+                return System.Convert.ToUInt32(str, 16);
+            }
+            else
+            {
+                return System.Convert.ToUInt32(str);
+            }
+        }
+
         private EDSsharp Convert(ISO15745ProfileContainer container)
         {
             EDSsharp eds = new EDSsharp();
@@ -1234,7 +1255,8 @@ private EDSsharp Convert(ISO15745ProfileContainer container)
             if (body_device != null)
             {
                 eds.fi.FileName = body_device.fileName ?? "";
-                eds.fi.FileVersion = Byte.Parse(body_device.fileVersion ?? "0");
+                eds.fi.fileVersionString = body_device.fileVersion ?? "";
+                GetEDSFileInfo(eds);
                 eds.fi.CreatedBy = body_device.fileCreator ?? "";
                 eds.fi.ModifiedBy = body_device.fileModifiedBy ?? "";
 
@@ -1257,15 +1279,15 @@ private EDSsharp Convert(ISO15745ProfileContainer container)
                     if (body_device.DeviceIdentity.vendorName != null)
                         eds.di.VendorName = body_device.DeviceIdentity.vendorName.Value ?? "";
                     if (body_device.DeviceIdentity.vendorID != null)
-                        eds.di.VendorNumber = UInt32.Parse(body_device.DeviceIdentity.vendorID.Value ?? "0");
+                        eds.di.VendorNumber = U32Parse(body_device.DeviceIdentity.vendorID.Value ?? "0");
                     if (body_device.DeviceIdentity.revisionNumber != null)
                         eds.di.RevisionNumber = body_device.DeviceIdentity.revisionNumber.Value;
                     if (body_device.DeviceIdentity.orderCode != null)
                         eds.di.OrderCode = body_device.DeviceIdentity.orderCode.Value ?? "";
                     if (body_device.DeviceIdentity.productName != null)
                         eds.di.ProductName = body_device.DeviceIdentity.productName.Value ?? "";
                     if (body_device.DeviceIdentity.productID != null)
-                        eds.di.ProductNumber = UInt32.Parse(body_device.DeviceIdentity.productID.Value ?? "0");
+                        eds.di.ProductNumber = U32Parse(body_device.DeviceIdentity.productID.Value ?? "0");
                     if (body_device.DeviceIdentity.productText != null)
                         eds.fi.Description = G_label_getDescription(body_device.DeviceIdentity.productText.Items);
                 }

libEDSsharp/eds.cs

@@ -1823,7 +1823,7 @@ public EDSsharp()
             fi.EDSVersionMinor = 0;
 
             fi.FileVersion = 1;
-            fi.FileRevision = 1;
+            fi.FileRevision = 0;
 
             fi.CreationDateTime = DateTime.Now;
             fi.ModificationDateTime = DateTime.Now;