moving UI to Logexpert.UI for better maintainability

Author: Hirogen

src/LogExpert/Classes/Log/LogfileReader.cs

@@ -2,7 +2,7 @@
 using LogExpert.Core.Classes.Log;
 using LogExpert.Core.Classes.xml;
 using LogExpert.Core.Entities;
-using LogExpert.Core.Entities.EventArgs;
+using LogExpert.Core.EventArgs;
 using LogExpert.Core.Interface;
 
 using NLog;

src/LogExpert/Classes/PaintHelper.cs

@@ -33,7 +33,7 @@ internal class PaintHelper
 
         #region Public methods
 
-        public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridView, int rowIndex,
+        public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridView gridView, int rowIndex,
             DataGridViewCellPaintingEventArgs e)
         {
             if (rowIndex < 0 || e.ColumnIndex < 0)
@@ -122,7 +122,6 @@ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridV
             }
         }
 
-
         public static DataGridViewTextBoxColumn CreateMarkerColumn()
         {
             DataGridViewTextBoxColumn markerColumn = new();
@@ -161,7 +160,7 @@ public static DataGridViewColumn CreateTitleColumn(string colName)
             return titleColumn;
         }
 
-        public static void SetColumnizer(ILogLineColumnizer columnizer, DataGridView gridView)
+        public static void SetColumnizer(ILogLineColumnizer columnizer, BufferedDataGridView gridView)
         {
             int rowCount = gridView.RowCount;
             int currLine = gridView.CurrentCellAddress.Y;
@@ -200,7 +199,7 @@ public static void SetColumnizer(ILogLineColumnizer columnizer, DataGridView gri
             //AutoResizeColumns(gridView);
         }
 
-        public static void AutoResizeColumns(DataGridView gridView)
+        public static void AutoResizeColumns(BufferedDataGridView gridView)
         {
             try
             {
@@ -224,7 +223,7 @@ public static void AutoResizeColumns(DataGridView gridView)
             }
         }
 
-        public static void ApplyDataGridViewPrefs(DataGridView dataGridView, Preferences prefs)
+        public static void ApplyDataGridViewPrefs(BufferedDataGridView dataGridView, Preferences prefs)
         {
             if (dataGridView.Columns.Count > 1)
             {
@@ -291,12 +290,12 @@ public static Rectangle BorderWidths(DataGridViewAdvancedBorderStyle advancedBor
 
         #region Private Methods
 
-        private static void PaintCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
+        private static void PaintCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, BufferedDataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
         {
             PaintHighlightedCell(logPaintCtx, e, gridView, noBackgroundFill, groundEntry);
         }
 
-        private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
+        private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, BufferedDataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
         {
             object value = e.Value ?? string.Empty;
 

src/LogExpert/Classes/TimeSpreadCalculator.cs

@@ -1,5 +1,6 @@
 using LogExpert.Classes.ILogLineColumnizerCallback;
 using LogExpert.Controls.LogWindow;
+using LogExpert.Core.Classes;
 
 using NLog;
 
@@ -10,7 +11,7 @@
 
 namespace LogExpert.Classes
 {
-    internal class TimeSpreadCalculator
+    internal partial class TimeSpreadCalculator
     {
         #region Fields
 
@@ -25,6 +26,7 @@ internal class TimeSpreadCalculator
         private readonly object _diffListLock = new();
         private readonly EventWaitHandle _lineCountEvent = new ManualResetEvent(false);
 
+        //TODO Refactor that it does not need LogWindow
         private readonly LogWindow _logWindow;
 
         // for DoCalc_via_Time
@@ -211,12 +213,14 @@ private void DoCalc()
         {
             OnStartCalc(EventArgs.Empty);
             _logger.Debug("TimeSpreadCalculator.DoCalc() begin");
+
             if (_callback.GetLineCount() < 1)
             {
                 OnCalcDone(EventArgs.Empty);
                 _logger.Debug("TimeSpreadCalculator.DoCalc() end because of line count < 1");
                 return;
             }
+
             int lineNum = 0;
             int lastLineNum = _callback.GetLineCount() - 1;
             _startTimestamp = _logWindow.GetTimestampForLineForward(ref lineNum, false);
@@ -231,6 +235,7 @@ private void DoCalc()
                 _timePerLine = (int)Math.Round(overallSpanMillis / (double)_lineCount);
                 DateTime oldTime = _logWindow.GetTimestampForLineForward(ref lineNum, false);
                 int step;
+
                 if (_lineCount > _displayHeight)
                 {
                     step = (int)Math.Round(_lineCount / (double)_displayHeight);
@@ -245,6 +250,7 @@ private void DoCalc()
                 List<SpreadEntry> newDiffList = [];
                 List<TimeSpan> maxList = [];
                 lineNum++;
+
                 for (int i = lineNum; i < lastLineNum; i += step)
                 {
                     int currLineNum = i;
@@ -259,11 +265,13 @@ private void DoCalc()
                         _logger.Debug("TimeSpreadCalculator.DoCalc() time diff {0}", span);
                     }
                 }
+
                 if (maxList.Count > 3)
                 {
                     maxList.Sort();
                     _maxSpan = maxList[^3];
                 }
+
                 lock (_diffListLock)
                 {
                     DiffList = newDiffList;
@@ -280,12 +288,14 @@ private void DoCalc_via_Time()
         {
             OnStartCalc(EventArgs.Empty);
             _logger.Debug("TimeSpreadCalculator.DoCalc_via_Time() begin");
+
             if (_callback.GetLineCount() < 1)
             {
                 OnCalcDone(EventArgs.Empty);
                 _logger.Debug("TimeSpreadCalculator.DoCalc() end because of line count < 1");
                 return;
             }
+
             int lineNum = 0;
             int lastLineNum = _callback.GetLineCount() - 1;
             _startTimestamp = _logWindow.GetTimestampForLineForward(ref lineNum, false);
@@ -296,8 +306,9 @@ private void DoCalc_via_Time()
                 TimeSpan overallSpan = _endTimestamp - _startTimestamp;
                 long overallSpanMillis = overallSpan.Ticks / TimeSpan.TicksPerMillisecond;
                 //int timePerLine = (int)Math.Round((double)overallSpanMillis / (double)this.lineCount);
-                DateTime oldTime = _logWindow.GetTimestampForLineForward(ref lineNum, false);
+
                 long step;
+
                 if (overallSpanMillis > _displayHeight)
                 {
                     step = (long)Math.Round(overallSpanMillis / (double)_displayHeight);
@@ -318,6 +329,7 @@ private void DoCalc_via_Time()
                 _maxDiff = 0;
                 List<int> maxList = [];
                 List<SpreadEntry> newDiffList = [];
+
                 while (searchTimeStamp.CompareTo(_endTimestamp) <= 0)
                 {
                     lineNum = _logWindow.FindTimestampLine_Internal(lineNum, lineNum, lastLineNum, searchTimeStamp, false);
@@ -351,11 +363,13 @@ private void DoCalc_via_Time()
                     oldLineNum = lineNum;
                     //lineNum++;
                 }
+
                 if (maxList.Count > 3)
                 {
                     maxList.Sort();
                     _maxDiff = maxList[^3];
                 }
+
                 _average = lineDiffSum / (double)loopCount;
                 //double average = maxList[maxList.Count / 2];
                 _logger.Debug("Average diff={0} minDiff={1} maxDiff={2}", _average, minDiff, _maxDiff);
@@ -383,9 +397,11 @@ private void DoCalc_via_Time()
         private DateTime CalcValuesViaLines(int timePerLine, TimeSpan maxSpan)
         {
             DateTime oldTime = DateTime.MinValue;
+
             if (DiffList.Count > 0)
             {
                 oldTime = DiffList[0].Timestamp;
+
                 foreach (SpreadEntry entry in DiffList)
                 {
                     TimeSpan span = entry.Timestamp - oldTime;
@@ -401,6 +417,7 @@ private DateTime CalcValuesViaLines(int timePerLine, TimeSpan maxSpan)
                     oldTime = entry.Timestamp;
                 }
             }
+
             return oldTime;
         }
 
@@ -410,12 +427,14 @@ private void CalcValuesViaTime(int maxDiff, double average)
             {
                 int lineDiff = entry.Diff;
                 double diffFromAverage = entry.Diff - average;
+
                 if (diffFromAverage < 0)
                 {
                     diffFromAverage = 0;
                 }
                 int value = (int)(diffFromAverage / maxDiff * _contrast);
                 entry.Value = 255 - value;
+
                 _logger.Debug("TimeSpreadCalculator.DoCalc() test time {0:HH:mm:ss.fff} line diff={1} value={2}", entry.Timestamp, lineDiff, value);
             }
         }
@@ -431,31 +450,5 @@ private void OnStartCalc(EventArgs e)
         }
 
         #endregion
-
-        public class SpreadEntry
-        {
-            #region Fields
-
-            public int Diff { get; set; }
-
-            public DateTime Timestamp { get; set; }
-
-            public int LineNum { get; set; }
-
-            public int Value { get; set; }
-
-            #endregion
-
-            #region cTor
-
-            public SpreadEntry(int lineNum, int diff, DateTime timestamp)
-            {
-                LineNum = lineNum;
-                Diff = diff;
-                Timestamp = timestamp;
-            }
-
-            #endregion
-        }
     }
 }

src/LogExpert/Config/ConfigManager.cs

@@ -2,7 +2,7 @@
 using LogExpert.Core.Classes.Filter;
 using LogExpert.Core.Config;
 using LogExpert.Core.Entities;
-using LogExpert.Core.Entities.EventArgs;
+using LogExpert.Core.EventArgs;
 
 using Newtonsoft.Json;