Changeset 6027

Timestamp:

04/19/11 12:37:16 (14 years ago)

Author:

epitzer

Message:

Small improvements to font serialization: (#1487)

• included font size units and vertical font indicator for complete serialization
• removed unnecessary checks for null during serialization
• removed checks during deserializaiton: incorrect files should not cause nulls to be deserialized but throw an error instead
• added unit test
• replaced string concatenation with string.Format()

Location:

branches/histogram/HeuristicLab.Persistence/3.3

Files:

• Default/Xml/Primitive/System.Drawing/Font2XmlSerializer.cs (modified) (2 diffs)
• Tests/UseCases.cs (modified) (1 diff)

branches/histogram/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/System.Drawing/Font2XmlSerializer.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
-using System.Globalization;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {
@@ -28 +27 @@
 
     public override XmlString Format(Font font) {
-      if (font != null) {
-        return new XmlString(font.Name
-          + ";" + font.SizeInPoints.ToString(CultureInfo.InvariantCulture.NumberFormat)
-          + ";" + font.Style.ToString("d")
-          + ";" + font.GdiCharSet.ToString());
-      }
-      return new XmlString(string.Empty);
+      return new XmlString(string.Format("{0};{1};{2};{3};{4};{5}",
+        font.Name,
+        Float2XmlSerializer.FormatG8(font.Size),
+        font.Style,
+        font.Unit,
+        font.GdiCharSet,
+        font.GdiVerticalFont));
     }
 
     public override Font Parse(XmlString fontData) {
-      if (string.IsNullOrEmpty(fontData.Data)) return null;
       string[] tokens = fontData.Data.Split(';');
-      if (tokens.Length < 4) return null;
-      float size = 12.0f;
-      FontStyle style = FontStyle.Regular;
-      byte gdiCharSet = 1;
-      if (!float.TryParse(tokens[1], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out size))
-        return null;
-      if (!Enum.TryParse(tokens[2], out style))
-        return null;
-      if (!byte.TryParse(tokens[3], out gdiCharSet))
-        return null;
-
-      return new Font(tokens[0], size, style, GraphicsUnit.Point, gdiCharSet);
+      return new Font(
+        tokens[0],
+        Float2XmlSerializer.ParseG8(tokens[1]),
+        (FontStyle)Enum.Parse(typeof(FontStyle), tokens[2]),
+        (GraphicsUnit)Enum.Parse(typeof(GraphicsUnit), tokens[3]),
+        byte.Parse(tokens[4]),
+        bool.Parse(tokens[5]));
     }
   }

branches/histogram/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -1255 +1255 @@
     }
 
+    [TestMethod]
+    public void FontTest() {
+      List<Font> fonts = new List<Font>() {
+        new Font(FontFamily.Families.First(), 12),
+        new Font("Times New Roman", 21, FontStyle.Bold, GraphicsUnit.Pixel),
+        new Font("Courier New", 10, FontStyle.Underline, GraphicsUnit.Document),
+        new Font("Helvetica", 21, FontStyle.Strikeout, GraphicsUnit.Inch, 0, true),
+      };
+      XmlGenerator.Serialize(fonts, tempFile);
+      var newFonts = XmlParser.Deserialize<List<Font>>(tempFile);
+      Assert.AreEqual(fonts[0], newFonts[0]);
+      Assert.AreEqual(fonts[1], newFonts[1]);
+      Assert.AreEqual(fonts[2], newFonts[2]);
+      Assert.AreEqual(fonts[3], newFonts[3]);
+    }
+