Merge pull request #184 from OregonGhost/PerformanceImprovements

Table performance improvements

Author: ststeiger

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Tables/Cell.cs

@@ -338,22 +338,22 @@ public Shading Shading
         /// </summary>
         public int MergeRight
         {
-            get { return this.mergeRight.Value; }
-            set { this.mergeRight.Value = value; }
+            get { return this.mergeRight ?? 0; }
+            set { this.mergeRight = value; }
         }
         [DV]
-        internal NInt mergeRight = NInt.NullValue;
+        internal int? mergeRight;
 
         /// <summary>
         /// Gets or sets the number of cells to be merged down.
         /// </summary>
         public int MergeDown
         {
-            get { return this.mergeDown.Value; }
-            set { this.mergeDown.Value = value; }
+            get { return this.mergeDown ?? 0; }
+            set { this.mergeDown = value; }
         }
         [DV]
-        internal NInt mergeDown = NInt.NullValue;
+        internal int? mergeDown;
 
         /// <summary>
         /// Gets the collection of document objects that defines the cell.
@@ -405,10 +405,10 @@ internal override void Serialize(Serializer serializer)
             if (!this.IsNull("Format"))
                 this.format.Serialize(serializer, "Format", null);
 
-            if (!this.mergeDown.IsNull)
+            if (this.mergeDown.HasValue)
                 serializer.WriteSimpleAttribute("MergeDown", this.MergeDown);
 
-            if (!this.mergeRight.IsNull)
+            if (this.mergeRight.HasValue)
                 serializer.WriteSimpleAttribute("MergeRight", this.MergeRight);
 
             if (!this.verticalAlignment.IsNull)

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Tables/Column.cs

@@ -115,16 +115,20 @@ public int Index
     {
       get
       {
-        if (IsNull("Index"))
+        if (!index.HasValue)
         {
-          Columns clms = this.Parent as Columns;
-          SetValue("Index", clms.IndexOf(this));
+          Columns clms = (Columns)Parent;
+          // One for all and all for one.
+          for (int i = 0; i < clms.Count; ++i)
+          {
+            clms[i].index = i;
+          }
         }
-        return index;
+        return index ?? 0;
       }
     }
     [DV]
-    internal NInt index = NInt.NullValue;
+    internal int? index;
 
     /// <summary>
     /// Gets a cell by its row index. The first cell has index 0.
@@ -134,7 +138,7 @@ public Cell this[int index]
       get
       {
         //Check.ArgumentOutOfRange(index >= 0 && index < table.Rows.Count, "index");
-        return Table.Rows[index][this.index];
+        return Table.Rows[index][this.index ?? 0];
       }
     }
 
@@ -230,11 +234,11 @@ public Borders Borders
     /// </summary>
     public int KeepWith
     {
-      get { return this.keepWith.Value; }
-      set { this.keepWith.Value = value; }
+      get { return this.keepWith ?? 0; }
+      set { this.keepWith = value; }
     }
     [DV]
-    internal NInt keepWith = NInt.NullValue;
+    internal int? keepWith;
 
     /// <summary>
     /// Gets or sets a value which define whether the column is a header.
@@ -309,7 +313,7 @@ internal override void Serialize(Serializer serializer)
       if (!this.width.IsNull)
         serializer.WriteSimpleAttribute("Width", this.Width);
 
-      if (!this.keepWith.IsNull)
+      if (this.keepWith.HasValue)
         serializer.WriteSimpleAttribute("KeepWith", this.KeepWith);
 
       if (!this.IsNull("Borders"))

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Tables/Row.cs

@@ -121,16 +121,20 @@ public int Index
     {
       get
       {
-        if (IsNull("index"))
+        if (!index.HasValue)
         {
-          Rows rws = this.parent as Rows;
-          SetValue("Index", rws.IndexOf(this));
+          Rows rws = (Rows)parent;
+          // One for all and all for one.
+          for (int i = 0; i < rws.Count; ++i)
+          {
+            rws[i].index = i;
+          }
         }
-        return index;
+        return index ?? 0;
       }
     }
     [DV]
-    internal NInt index = NInt.NullValue;
+    internal int? index;
 
     /// <summary>
     /// Gets a cell by its column index. The first cell has index 0.
@@ -286,11 +290,11 @@ public Shading Shading
     /// </summary>
     public int KeepWith
     {
-      get { return this.keepWith.Value; }
-      set { this.keepWith.Value = value; }
+      get { return this.keepWith ?? 0; }
+      set { this.keepWith = value; }
     }
     [DV]
-    internal NInt keepWith = NInt.NullValue;
+    internal int? keepWith;
 
     /// <summary>
     /// Gets the Cells collection of the table.
@@ -360,7 +364,7 @@ internal override void Serialize(Serializer serializer)
       if (!this.verticalAlignment.IsNull)
         serializer.WriteSimpleAttribute("VerticalAlignment", this.VerticalAlignment);
 
-      if (!this.keepWith.IsNull)
+      if (this.keepWith.HasValue)
         serializer.WriteSimpleAttribute("KeepWith", this.KeepWith);
 
       //Borders & Shading

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Visitors/CellComparer.cs

@@ -31,7 +31,7 @@
 #endregion
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using MigraDocCore.DocumentObjectModel.Tables;
 using MigraDocCore.DocumentObjectModel.MigraDoc.DocumentObjectModel.Resources;
 
@@ -41,23 +41,21 @@ namespace MigraDocCore.DocumentObjectModel.Visitors
   /// Comparer for the cell positions within a table.
   /// It compares the cell positions from top to bottom and left to right.
   /// </summary>
-  public class CellComparer : IComparer
+  public class CellComparer : IComparer<Cell>
   {
-    public int Compare(object lhs, object rhs)
+    public int Compare(Cell lhs, Cell rhs)
     {
-      if (!(lhs is Cell))
-        throw new ArgumentException(AppResources.CompareJustCells, "lhs");
+      if (ReferenceEquals(lhs, null))
+        throw new ArgumentNullException(nameof(lhs));
 
-      if (!(rhs is Cell))
-        throw new ArgumentException(AppResources.CompareJustCells, "rhs");
+      if (ReferenceEquals(rhs, null))
+        throw new ArgumentNullException(nameof(rhs));
 
-      Cell cellLhs = lhs as Cell;
-      Cell cellRhs = rhs as Cell;
-      int rowCmpr = cellLhs.Row.Index - cellRhs.Row.Index;
+      int rowCmpr = lhs.Row.Index - rhs.Row.Index;
       if (rowCmpr != 0)
         return rowCmpr;
 
-      return cellLhs.Column.Index - cellRhs.Column.Index;
+      return lhs.Column.Index - rhs.Column.Index;
     }
   }
 }

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Visitors/MergedCellList.cs

@@ -32,6 +32,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using MigraDocCore.DocumentObjectModel.IO;
 using MigraDocCore.DocumentObjectModel.Tables;
 using MigraDocCore.DocumentObjectModel.Visitors;
@@ -42,49 +43,8 @@ namespace MigraDocCore.DocumentObjectModel.Visitors
   /// <summary>
   /// Represents a merged list of cells of a table.
   /// </summary>
-  public class MergedCellList : ArrayList
+  public class MergedCellList : List<Cell>
   {
-
-    /// <summary>
-    /// Enumerator that can iterate through the MergedCellList.
-    /// </summary>
-    public class Enumerator : IEnumerator
-    {
-      internal Enumerator(MergedCellList list)
-      {
-        this.list = list;
-      }
-
-      #region IEnumerator Members
-
-      public void Reset()
-      {
-        this.index = -1;
-      }
-
-      public Cell Current
-      {
-        get
-        {
-          return (Cell)this.list[this.index];
-        }
-      }
-
-      object IEnumerator.Current
-      {
-        get { return Current; }
-      }
-
-      public bool MoveNext()
-      {
-        return ++index < this.list.Count;
-      }
-      #endregion
-
-      MergedCellList list;
-      int index = -1;
-    }
-
     /// <summary>
     /// Enumeration of neighbor positions of cells in a table.
     /// </summary>
@@ -144,14 +104,6 @@ private bool IsAlreadyCovered(Cell cell)
       return false;
     }
 
-    /// <summary>
-    /// Gets the Enumerator for this list.
-    /// </summary>
-    public override IEnumerator GetEnumerator()
-    {
-      return new Enumerator(this);
-    }
-
     /// <summary>
     /// Gets the cell at the specified position.
     /// </summary>
@@ -189,7 +141,7 @@ public Borders GetEffectiveBorders(Cell cell)
 
       if (cell.mergeRight > 0)
       {
-        Cell rightBorderCell = cell.Table[cell.Row.Index, cell.Column.Index + cell.mergeRight];
+        Cell rightBorderCell = cell.Table[cell.Row.Index, cell.Column.Index + (cell.mergeRight ?? 0)];
         if (rightBorderCell.borders != null && rightBorderCell.borders.right != null)
           borders.Right = rightBorderCell.borders.right.Clone();
         else
@@ -198,7 +150,7 @@ public Borders GetEffectiveBorders(Cell cell)
 
       if (cell.mergeDown > 0)
       {
-        Cell bottomBorderCell = cell.Table[cell.Row.Index + cell.mergeDown, cell.Column.Index];
+        Cell bottomBorderCell = cell.Table[cell.Row.Index + (cell.mergeDown ?? 0), cell.Column.Index];
         if (bottomBorderCell.borders != null && bottomBorderCell.borders.bottom != null)
           borders.Bottom = bottomBorderCell.borders.bottom.Clone();
         else

MigraDocCore.Rendering/MigraDoc.Rendering/TableFormatInfo.cs

@@ -30,8 +30,11 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using MigraDocCore.DocumentObjectModel;
+using MigraDocCore.DocumentObjectModel.Tables;
 using MigraDocCore.DocumentObjectModel.Visitors;
+using PdfSharpCore.Drawing;
 
 namespace MigraDocCore.Rendering
 {
@@ -86,9 +89,9 @@ internal override bool IsStarting
     internal int endRow = -1;
 
     internal int lastHeaderRow = -1;
-    internal SortedList formattedCells;
+    internal SortedList<Cell, FormattedCell> formattedCells;
     internal MergedCellList mergedCells;
-    internal SortedList bottomBorderMap;
-    internal SortedList connectedRowsMap;
+    internal SortedList<int, XUnit> bottomBorderMap;
+    internal SortedList<int, int> connectedRowsMap;
   }
 }