TableCell class was added

StructureHelperCommon/Models/Loggers/Factories/TraceTablesFactory.cs

@@ -8,18 +8,25 @@ using System.Threading.Tasks;
 
 namespace StructureHelperCommon.Models.Loggers
 {
-    public static class TraceLoggerTableByPointsFactory
+    public class TraceTablesFactory
     {
-        public static TableLoggerEntry GetTableByPoint2D(IPoint2D point2D)
+        public int Priority { get; set; }
+        public TraceTablesFactory(TraceLoggerStatuses status = TraceLoggerStatuses.Info, int priorityShift = 0)
+        {
+            Priority = LoggerService.GetPriorityByStatus(status) + priorityShift;
+        }
+        public TableLoggerEntry GetTableByPoint2D(IPoint2D point2D)
         {
             var table = new TableLoggerEntry(2);
+            table.Priority = Priority;
             table.Table.AddRow(GetHeaderRow());
             table.Table.AddRow(GetPointRow(point2D));
             return table;
         }
-        public static TableLoggerEntry GetTableByPoint2D(IEnumerable<IPoint2D> points)
+        public TableLoggerEntry GetTableByPoint2D(IEnumerable<IPoint2D> points)
         {
             var table = new TableLoggerEntry(2);
+            table.Priority = Priority;
             table.Table.AddRow(GetHeaderRow());
             foreach (var item in points)
             {
@@ -28,30 +35,44 @@ namespace StructureHelperCommon.Models.Loggers
             return table;
         }
 
-        private static ShTableRow<ITraceLoggerEntry> GetHeaderRow()
+        private ShTableRow<ITraceLoggerEntry> GetHeaderRow()
         {
             var headerRow = new ShTableRow<ITraceLoggerEntry>(2);
-            headerRow.Elements[0] = new StringLoggerEntry()
+            IShTableCell<ITraceLoggerEntry> tableCell;
+            ITraceLoggerEntry loggerEntry;
+            loggerEntry = new StringLoggerEntry()
             {
                 Message = "X",
                 Priority = LoggerService.GetPriorityByStatus(TraceLoggerStatuses.Info)
             };
-            headerRow.Elements[1] = new StringLoggerEntry()
+            tableCell = new ShTableCell<ITraceLoggerEntry>()
+            {
+                Value = loggerEntry,
+                Role = CellRole.Header,
+            };
+            headerRow.Elements[0] = tableCell;
+            loggerEntry = new StringLoggerEntry()
             {
                 Message = "Y",
                 Priority = LoggerService.GetPriorityByStatus(TraceLoggerStatuses.Info)
             };
+            tableCell = new ShTableCell<ITraceLoggerEntry>()
+            {
+                Value = loggerEntry,
+                Role = CellRole.Header,
+            };
+            headerRow.Elements[1] = tableCell;
             return headerRow;
         }
-        private static ShTableRow<ITraceLoggerEntry> GetPointRow(IPoint2D point2D)
+        private ShTableRow<ITraceLoggerEntry> GetPointRow(IPoint2D point2D)
         {
             var pointRow = new ShTableRow<ITraceLoggerEntry>(2);
-            pointRow.Elements[0] = new StringLoggerEntry()
+            pointRow.Elements[0].Value = new StringLoggerEntry()
             {
                 Message = Convert.ToString(point2D.X),
                 Priority = LoggerService.GetPriorityByStatus(TraceLoggerStatuses.Info)
             };
-            pointRow.Elements[1] = new StringLoggerEntry()
+            pointRow.Elements[1].Value = new StringLoggerEntry()
             {
                 Message = Convert.ToString(point2D.Y),
                 Priority = LoggerService.GetPriorityByStatus(TraceLoggerStatuses.Info)

StructureHelperCommon/Models/Loggers/TableLoggerEntry.cs

@@ -9,8 +9,8 @@ namespace StructureHelperCommon.Models.Loggers
 {
     public class TableLoggerEntry : ITraceLoggerEntry
     {
-        private ListTable<ITraceLoggerEntry> table;
-        public ListTable<ITraceLoggerEntry> Table {get => table;}
+        private ShTable<ITraceLoggerEntry> table;
+        public ShTable<ITraceLoggerEntry> Table {get => table;}
         public DateTime TimeStamp { get; }
 
         public int Priority { get; set; }

StructureHelperCommon/Models/Tables/IShTableCell.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Tables
+{
+    public enum CellRole
+    {
+        Title,
+        Header,
+        Regular
+    }
+
+    /// <summary>
+    /// Generic interface for cell of table
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public interface IShTableCell<T>
+    {
+        /// <summary>
+        /// Value of cell
+        /// </summary>
+        T Value { get; set; }
+        /// <summary>
+        /// Number of cell, joined with this one
+        /// </summary>
+        int ColumnSpan { get; set; }
+        /// <summary>
+        /// Role of the cell in table
+        /// </summary>
+        CellRole Role { get; set; }
+    }
+}

StructureHelperCommon/Models/Tables/IShTableRow.cs

@@ -4,7 +4,7 @@ namespace StructureHelperCommon.Models.Tables
 {
     public interface IShTableRow<T>
     {
-        List<T> Elements { get; }
+        List<IShTableCell<T>> Elements { get; }
         int RowSize { get; }
     }
 }

StructureHelperCommon/Models/Tables/ShTable.cs

@@ -6,13 +6,13 @@ using System.Threading.Tasks;
 
 namespace StructureHelperCommon.Models.Tables
 {
-    public class ListTable<T>
+    public class ShTable<T>
     {
         private List<IShTableRow<T>> table;
 
         public int RowSize { get; }
 
-        public ListTable(int rowSize)
+        public ShTable(int rowSize)
         {
             if (rowSize <= 0)
             {
@@ -42,7 +42,7 @@ namespace StructureHelperCommon.Models.Tables
             return table;
         }
 
-        public List<T> GetElementsFromRow(int rowIndex)
+        public List<IShTableCell<T>> GetElementsFromRow(int rowIndex)
         {
             if (rowIndex >= 0 && rowIndex < table.Count)
             {
@@ -66,7 +66,7 @@ namespace StructureHelperCommon.Models.Tables
             if (columnIndex >= 0 && columnIndex < RowSize &&
                 rowIndex >= 0 && rowIndex < table.Count)
             {
-                table[rowIndex].Elements[columnIndex] = value;
+                table[rowIndex].Elements[columnIndex].Value = value;
             }
             else
             {

StructureHelperCommon/Models/Tables/ShTableCell.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Tables
+{
+    /// <inheritdoc/>
+    public class ShTableCell<T> : IShTableCell<T>
+    {
+        /// <inheritdoc/>
+        public T Value { get; set; }
+        /// <inheritdoc/>
+        public int ColumnSpan { get; set; }
+        /// <inheritdoc/>
+        public CellRole Role { get; set; }
+        public ShTableCell()
+        {
+            Role = CellRole.Regular;
+            ColumnSpan = 1;
+        }
+    }
+}

StructureHelperCommon/Models/Tables/ShTableRow.cs

@@ -8,7 +8,7 @@ namespace StructureHelperCommon.Models.Tables
 {
     public class ShTableRow<T> : IShTableRow<T>
     {
-        private List<T> elements;
+        private List<IShTableCell<T>> elements;
 
         public int RowSize { get; }
 
@@ -20,15 +20,16 @@ namespace StructureHelperCommon.Models.Tables
             }
 
             RowSize = rowSize;
-            elements = new List<T>(rowSize);
+            elements = new List<IShTableCell<T>>(rowSize);
             for (int i = 0; i < rowSize; i++)
             {
-                elements.Add(default);
+                var newCell = new ShTableCell<T>();
+                elements.Add(newCell);
             }
         }
 
         // Property to access elements in the row
-        public List<T> Elements => elements;
+        public List<IShTableCell<T>> Elements => elements;
 
         internal void Add(object value)
         {