Finished new filter feature.

Author: couchcoding

src/Logbert/Dialogs/Docking/FrmLogFilter.Designer.cs

@@ -78,6 +78,11 @@ public partial class FrmLogFilter : DockContent, ILogPresenter, ILogFilterProvid
     /// </summary>
     private readonly IList<LogFilter> mLogFilter = new List<LogFilter>();
 
+    /// <summary>
+    /// The <see cref="Image"/> to use for <see cref=LogFilter"/>s.
+    /// </summary>
+    private static readonly Image mFilterImage = Properties.Resources.filter_16xLG;
+
     #endregion
 
     #region Public Properties
@@ -136,6 +141,46 @@ protected override void Dispose(bool disposing)
 
     #region Private Methods
 
+    /// <summary>
+    /// Update the <see cref="DataGridView"/> of <see cref=LogFilter"/>s.
+    /// </summary>
+    private void UpdateLogFilters()
+    {
+      if (mLogFilter != null)
+      {
+        LogFilter selectedFilter = dgvFilter.SelectedRows.Count > 0
+          ? dgvFilter.SelectedRows[0].Tag as LogFilter
+          : null;
+
+        dgvFilter.SuspendDrawing();
+
+        try
+        {
+          dgvFilter.Rows.Clear();
+
+          foreach (LogFilterColumn filter in mLogFilter)
+          {
+            int rowIndex = dgvFilter.Rows.Add(
+                mFilterImage
+              , filter.IsActive
+              , mLogProvider.Columns[filter.ColumnIndex - 1]
+              , filter.ColumnMatchValueRegEx);
+
+            dgvFilter.Rows[rowIndex].Tag = filter;
+
+            if (Equals(selectedFilter, filter))
+            {
+              dgvFilter.Rows[rowIndex].Selected = true;
+            }
+          }
+        }
+        finally
+        {
+          dgvFilter.ResumeDrawing();
+        }
+      }
+    }
+
     /// <summary>
     /// Handles the Click event of the zoom in <see cref="ToolStripItem"/>.
     /// </summary>
@@ -167,7 +212,51 @@ private void TsbAddFilterClick(object sender, EventArgs e)
       {
         if (addEditFilterDlg.ShowDialog(this) == DialogResult.OK)
         {
-          // TODO (CC): Add the new filter.
+          LogFilterColumn newLogFilter = new LogFilterColumn(
+              addEditFilterDlg.IsFilterActive
+            , addEditFilterDlg.ColumnIndex
+            , addEditFilterDlg.ExpressionRegex);
+
+          mLogFilter.Add(newLogFilter);
+
+          // Update the data grid.
+          UpdateLogFilters();
+
+          // Inform the filter handler about the changed filters.
+          mLogFilterHandler.FilterChanged();
+        }
+      }
+    }
+
+    /// <summary>
+    /// Handles the Click event of the edit filter <see cref="ToolStripItem"/>.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void TsbEditFilterClick(object sender, EventArgs e)
+    {
+      if (dgvFilter.SelectedRows.Count > 0)
+      {
+        LogFilterColumn filterToEdit = dgvFilter.SelectedRows[0].Tag as LogFilterColumn;
+
+        if (filterToEdit != null)
+        {
+          using (FrmAddEditFilter addEditFilterDlg = new FrmAddEditFilter(mLogProvider, filterToEdit))
+          {
+            if (addEditFilterDlg.ShowDialog(this) == DialogResult.OK)
+            {
+              filterToEdit.Update(
+                  addEditFilterDlg.IsFilterActive
+                , addEditFilterDlg.ColumnIndex
+                , addEditFilterDlg.ExpressionRegex);
+
+              // Update the data grid.
+              UpdateLogFilters();
+
+              // Inform the filter handler about the changed filters.
+              mLogFilterHandler.FilterChanged();
+            }
+          }
         }
       }
     }
@@ -177,26 +266,78 @@ private void TsbAddFilterClick(object sender, EventArgs e)
     /// </summary>
     private void TsbRemoveFilterClick(object sender, EventArgs e)
     {
+      if (dgvFilter.SelectedRows.Count > 0)
+      {
+        // Remove the filter from the collction.
+        mLogFilter.Remove(dgvFilter.SelectedRows[0].Tag as LogFilter);
+
+        // Update the data grid.
+        UpdateLogFilters();
 
+        // Inform the filter handler about the changed filters.
+        mLogFilterHandler.FilterChanged();
+      }
     }
 
     /// <summary>
     /// Handles the SelectionChanged event of the filter <see cref="DataGridView"/>.
     /// </summary>
     private void DgvFilterSelectionChanged(object sender, EventArgs e)
     {
+      bool atLeastOneItemSelected = dgvFilter.SelectedRows.Count > 0;
 
+      tsbRemoveFilter.Enabled = atLeastOneItemSelected;
+      tsbEditFilter.Enabled   = atLeastOneItemSelected;
     }
 
     /// <summary>
     /// Handles the CellDoubleClick event of the filter <see cref="DataGridView"/>.
     /// </summary>
     private void DgvFilterCellCoubleClick(object sender, DataGridViewCellEventArgs e)
     {
-      if (e.RowIndex >= dgvFilter.RowCount || e.RowIndex < 0)
+      if (e.RowIndex >= dgvFilter.RowCount || e.RowIndex < 0 || e.ColumnIndex == 1)
       {
         return;
       }
+
+      // Double click means editing!
+      tsbEditFilter.PerformClick();
+    }
+
+    /// <summary>
+    /// Handles the CellValueChanged event of the filter <see cref=DataGridView"/>.
+    /// </summary>
+    private void DgvFilterCellValueChanged(object sender, DataGridViewCellEventArgs e)
+    {
+      if (e.RowIndex >= 0 && e.ColumnIndex == 1)
+      {
+        LogFilterColumn filterToEdit = dgvFilter.Rows[e.RowIndex].Tag as LogFilterColumn;
+
+        if (filterToEdit != null)
+        {
+          filterToEdit.Update(
+              (bool)dgvFilter.Rows[e.RowIndex].Cells[e.ColumnIndex].Value
+            , filterToEdit.ColumnIndex
+            , filterToEdit.ColumnMatchValueRegEx);
+
+          // Update the data grid.
+          UpdateLogFilters();
+
+          // Inform the filter handler about the changed filters.
+          mLogFilterHandler.FilterChanged();
+        }
+      }
+    }
+
+    /// <summary>
+    /// Handles the CurrentCellDirtyStateChanged event of the filter <see cref=DataGridView"/>.
+    /// </summary>
+    private void DgvFilterCurrentCellDirtyStateChanged(object sender, EventArgs e)
+    {
+      if (dgvFilter.IsCurrentCellDirty)
+      {
+        dgvFilter.CommitEdit(DataGridViewDataErrorContexts.Commit);
+      }
     }
 
     #endregion

src/Logbert/Dialogs/Docking/FrmLogFilter.cs

@@ -62,6 +62,39 @@ public override string Text
       }
     }
 
+    /// <summary>
+    /// Gets the selected active state of the <see cref="LogFilter"/>.
+    /// </summary>
+    public bool IsFilterActive
+    {
+      get
+      {
+        return chkFilterIsActive.Checked;
+      }
+    }
+
+    /// <summary>
+    /// Gets the selected column index of the <see cref=LogFilter"/>.
+    /// </summary>
+    public int ColumnIndex
+    {
+      get
+      {
+        return cmbColumnToFilter.SelectedIndex + 1;
+      }
+    }
+
+    /// <summary>
+    /// Gets the entered regular expression of the <see cref=LogFilter"/>.
+    /// </summary>
+    public string ExpressionRegex
+    {
+      get
+      {
+        return txtExpressionToFilterFor.Text;
+      }
+    }
+
     #endregion
 
     #region Constructor
@@ -94,7 +127,7 @@ public FrmAddEditFilter(ILogProvider logProvider, LogFilterColumn filterToEdit)
       if (filterToEdit != null)
       {
         chkFilterIsActive.Checked       = filterToEdit.IsActive;
-        cmbColumnToFilter.SelectedIndex = filterToEdit.ColumnIndex;
+        cmbColumnToFilter.SelectedIndex = filterToEdit.ColumnIndex - 1;
         txtExpressionToFilterFor.Text   = filterToEdit.ColumnMatchValueRegEx;
       }
     }

src/Logbert/Dialogs/FrmAddEditFilter.cs

@@ -38,7 +38,7 @@ public abstract class LogFilter
     #region Public Properties
 
     /// <summary>
-    /// Determines whether the <see cref=LogFilter"/> is active, or not.
+    /// Gets or sets whether the <see cref=LogFilter"/> is active, or not.
     /// </summary>
     public abstract bool IsActive
     {

src/Logbert/Logging/Filter/LogFilter.cs

@@ -39,17 +39,20 @@ public sealed class LogFilterColumn : LogFilter
   {
     #region Private Fields
 
+    /// <summary>
+    /// Hold the active state of the <see cref="LogFilterColumn"/>.
+    /// </summary>
     private bool mIsActive;
 
     /// <summary>
     /// Holds the index of the column to match.
     /// </summary>
-    private readonly int mColumnIndex;
+    private int mColumnIndex;
 
     /// <summary>
     /// Holds the value the column should have to match.
     /// </summary>
-    private readonly Regex mColumnMatchValueRegEx;
+    private Regex mColumnMatchValueRegEx;
 
     #endregion
 
@@ -110,18 +113,32 @@ public override bool Match(LogMessage value)
         mColumnMatchValueRegEx.IsMatch(columnValue.ToString());
     }
 
+    /// <summary>
+    /// Update the <see cref=LogFilterColumn"/> with the specified parameters.
+    /// </summary>
+    /// <param name="isActive">The new active state of the <see cref=LogFilterColumn"/>.</param>
+    /// <param name="columnIndex">The new column index of the <see cref=LogFilterColumn"/>.</param>
+    /// <param name="expression">The new regular expression of the <see cref=LogFilterColumn"/>.</param>
+    public void Update(bool isActive, int columnIndex, string expression)
+    {
+      mIsActive              = isActive;
+      mColumnIndex           = columnIndex;
+      mColumnMatchValueRegEx = new Regex(expression);
+    }
+
     #endregion
 
     #region Constructor
 
     /// <summary>
     /// Creates a new instance of a <see cref="LogFilterLevel"/>.
     /// </summary>
+    /// <param name="isActive">The active state of the <see cref=LogFilterColumn"/>.</param>
     /// <param name="columnIndex">The index of the column to match.</param>
     /// <param name="matchRegex">The string for the column match <see cref="Regex"/>.</param>
-    public LogFilterColumn(int columnIndex, string matchRegex)
+    public LogFilterColumn(bool isActive, int columnIndex, string matchRegex)
     {
-      mIsActive              = true;
+      mIsActive              = isActive;
       mColumnIndex           = columnIndex;
       mColumnMatchValueRegEx = new Regex(matchRegex ?? ".*");
     }