Skip to content

Commit

Permalink
framework for filter handling is established
Browse files Browse the repository at this point in the history
  • Loading branch information
@braunms
braunms committed Jul 12, 2024
1 parent a06eb8a commit 92ba4a0
Show file tree
Hide file tree
Showing 20 changed files with 472 additions and 194 deletions.
221 changes: 201 additions & 20 deletions Core/Abstracts/AbstractFilter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
using Core.Abstracts;
using Core.Filter;
using Core.Data;
using static Core.Filter.FilterManager;
using System.Runtime.Remoting.Contexts;
using System.Windows.Input;
using System.Windows.Data;
using System.Drawing.Printing;



Expand Down Expand Up @@ -42,7 +44,7 @@ public class Configuration : IAbstractConfigurationData

public class ContentMetadata
{
public string Name { get; set; }
public Binding NameBinding { get; set; }
public int DataUID { get; set; }
}

Expand All @@ -65,20 +67,23 @@ public enum ListModification
#region public properties

public int _UID { get; } = UniqueID.GenerateInt();
public string _Name { get; set; }
public string _Name { get { return _filter_caption.Text; } protected set { _filter_caption.Text = value; } }

#endregion

/* ------------------------------------------------------------------*/
#region public functions

public bool Initialize(DataManager.GetGenericDataCallback_Delegate get_selected_data_callback, DataManager.UpdateSelectedDataCallback_Delegate update_selected_data_callback, ModifyUIFilterList_Delegate modify_ui_filter_list_callback)
public bool Initialize(DataManager.GetGenericDataCallback_Delegate get_selected_data_callback,
DataManager.UpdateSelectedDataCallback_Delegate update_selected_data_callback,
FilterManager.ModifyUIFilterList_Delegate modify_ui_filter_list_callback,
FilterManager.DeleteFilterCallback_Delegate delete_self_callback)
{
if (_initialized)
{
Terminate();
}
if ((get_selected_data_callback == null) || (update_selected_data_callback == null) || (modify_ui_filter_list_callback == null))
if ((get_selected_data_callback == null) || (update_selected_data_callback == null) || (modify_ui_filter_list_callback == null) || (delete_self_callback == null))
{
Log.Default.Msg(Log.Level.Error, "Missing callback(s)");
}
Expand All @@ -88,7 +93,7 @@ public bool Initialize(DataManager.GetGenericDataCallback_Delegate get_selected_
_update_selected_data_callback = update_selected_data_callback;
_get_selected_data_callback = get_selected_data_callback;
_modify_ui_filter_list_callback = modify_ui_filter_list_callback;

_delete_self_callback = delete_self_callback;

_timer.Stop();
_initialized = true;
Expand All @@ -106,6 +111,10 @@ public override bool Terminate()
_modify_ui_filter_list_callback(_content, ListModification.DELETE);

_content = null;
_filter_caption = null;
_visualizations_list = null;
_apply_button = null;

_update_selected_data_callback = null;
_get_selected_data_callback = null;
_modify_ui_filter_list_callback = null;
Expand Down Expand Up @@ -133,24 +142,150 @@ public virtual bool CreateUI()
}
_timer.Start();

_content = new Border();
_filter_caption = new RenameLabel();
_visualizations_list = new StackPanel();
_apply_button = new Button();

_content = new Grid();
_filter_caption.Margin = new Thickness(_margin, _margin, _margin, 0.0);
_filter_caption.HorizontalAlignment = HorizontalAlignment.Stretch;

var rename_button = new Button();
var endisable_button = new Button();
var delete_button = new Button();
var apply_button = new Button(); // Disable on hit, but enable when anything changes
var button_grid = new Grid();

_apply_button.Content = " Apply ";
_apply_button.Margin = new Thickness(_margin, _margin, 0.0, 0.0);
_apply_button.Click += _apply_button_click;
set_filter_dirty();

// Subscribe to list update (add/delete content with own data) List Visualization Name -> binding/ Data UID
var button_column = new ColumnDefinition();
button_column.Width = new GridLength(0.0, GridUnitType.Auto);
button_grid.ColumnDefinitions.Add(button_column);
Grid.SetColumn(_apply_button, 0);
button_grid.Children.Add(_apply_button);

var rename_button = new Button();
rename_button.Content = " Rename ";
rename_button.Margin = new Thickness(_margin, _margin, 0.0, 0.0);
rename_button.Click += (object sender, RoutedEventArgs e) =>
{
_filter_caption.Focusable = true;
_filter_caption.Style = null;
_filter_caption.Cursor = null;
_filter_caption.Focus();
};
button_column = new ColumnDefinition();
button_column.Width = new GridLength(0.0, GridUnitType.Auto);
button_grid.ColumnDefinitions.Add(button_column);
Grid.SetColumn(rename_button, 1);
button_grid.Children.Add(rename_button);

var disable_button = new Button();
disable_button.Content = " Disable ";
disable_button.Margin = new Thickness(_margin, _margin, 0.0, 0.0);
disable_button.IsEnabled = false;
button_column = new ColumnDefinition();
button_column.Width = new GridLength(0.0, GridUnitType.Auto);
button_grid.ColumnDefinitions.Add(button_column);
Grid.SetColumn(disable_button, 2);
button_grid.Children.Add(disable_button);

var delete_button = new Button();
delete_button.Content = " Delete ";
delete_button.Margin = new Thickness(_margin, _margin, 0.0, 0.0);
delete_button.Click += (object sender, RoutedEventArgs e) =>
{
if (_delete_self_callback != null)
{
_delete_self_callback(_UID);
}
else
{
Log.Default.Msg(Log.Level.Error, "Missing callback.");
}
};
button_column = new ColumnDefinition();
button_column.Width = new GridLength(0.0, GridUnitType.Auto);
button_grid.ColumnDefinitions.Add(button_column);
Grid.SetColumn(delete_button, 3);
button_grid.Children.Add(delete_button);

var apply_grid = new Grid();

var list_label = new TextBlock();
list_label.Text = "Select Content";
list_label.Margin = new Thickness(_margin, _margin, 0.0, 0.0);
var apply_text_column = new ColumnDefinition();
apply_text_column.Width = new GridLength(1.0, GridUnitType.Auto);
apply_grid.ColumnDefinitions.Add(apply_text_column);
Grid.SetColumn(_apply_button, 0);
apply_grid.Children.Add(list_label);

var hrule = new Border();
hrule.SetResourceReference(Border.BackgroundProperty, "Brush_Background");
hrule.SetResourceReference(Border.BorderBrushProperty, "Brush_Foreground");
hrule.BorderThickness = new Thickness(2.0, 2.0, 2.0, 2.0);
hrule.Margin = new Thickness(_margin, _margin, _margin, _margin);
hrule.CornerRadius = new CornerRadius(0);
hrule.Height = 2.0;
hrule.VerticalAlignment = VerticalAlignment.Bottom;
hrule.HorizontalAlignment = HorizontalAlignment.Stretch;
var apply_rule_column = new ColumnDefinition();
apply_rule_column.Width = new GridLength(1.0, GridUnitType.Star);
apply_grid.ColumnDefinitions.Add(apply_rule_column);
Grid.SetColumn(hrule, 1);
apply_grid.Children.Add(hrule);

var content_grid = new Grid();

var caption_row = new RowDefinition();
caption_row.Height = new GridLength(1.0, GridUnitType.Auto);
content_grid.RowDefinitions.Add(caption_row);
Grid.SetRow(_filter_caption, 0);
content_grid.Children.Add(_filter_caption);

var button_row = new RowDefinition();
button_row.Height = new GridLength(1.0, GridUnitType.Auto);
content_grid.RowDefinitions.Add(button_row);
Grid.SetRow(button_grid, 1);
content_grid.Children.Add(button_grid);

var list_caption_row = new RowDefinition();
list_caption_row.Height = new GridLength(1.0, GridUnitType.Auto);
content_grid.RowDefinitions.Add(list_caption_row);
Grid.SetRow(apply_grid, 2);
content_grid.Children.Add(apply_grid);

var list_row = new RowDefinition();
list_row.Height = new GridLength(1.0, GridUnitType.Auto);
content_grid.RowDefinitions.Add(list_row);
Grid.SetRow(_visualizations_list, 3);
content_grid.Children.Add(_visualizations_list);

// Get generic data of DataType -> apply changed data to DataType

// Add custom UI of inheriting filter
var child = create_ui();

var child_border = new Border();
child_border.SetResourceReference(Border.BackgroundProperty, "Brush_Background");
child_border.SetResourceReference(Border.BorderBrushProperty, "Brush_Foreground");
child_border.BorderThickness = new Thickness(2.0, 2.0, 2.0, 2.0);
child_border.CornerRadius = new CornerRadius(0);
child_border.Margin = new Thickness(_margin, _margin, _margin, _margin);
child_border.Child = child;

var filter_row = new RowDefinition();
filter_row.Height = new GridLength(1.0, GridUnitType.Auto);
content_grid.RowDefinitions.Add(filter_row);
Grid.SetRow(child_border, 4);
content_grid.Children.Add(child_border);

_content.SetResourceReference(Border.BackgroundProperty, "Brush_Background");
_content.BorderThickness = new Thickness(2.0, 2.0, 2.0, 2.0);
_content.SetResourceReference(Border.BorderBrushProperty, "Brush_Foreground");
_content.CornerRadius = new CornerRadius(0);
_content.Margin = new Thickness(_margin, _margin, _margin, _margin);
_content.Child = content_grid;


// Attach filter UI to filter list of Filter Editor
_modify_ui_filter_list_callback(_content, ListModification.ADD);


Expand All @@ -173,11 +308,31 @@ public UIElement GetUI()
/// Called on creation of filter
/// </summary>
/// <param name="content_metadata"></param>
public void ProvideContentDataCallback(List<ContentMetadata> content_metadata)
public void ContentMetadataListCallback(List<ContentMetadata> content_metadata)
{
// Update check boxes in content list
if (!_created)
{
Log.Default.Msg(Log.Level.Error, "Creation of content required prior to execution");
return;
}

_visualizations_list.Children.Clear();

foreach (var metadata in content_metadata)
{
var check = new CheckBox();
check.SetBinding(CheckBox.ContentProperty, metadata.NameBinding);
check.Margin = new Thickness(_margin, _margin, 0.0, 0.0);
check.Tag = metadata.DataUID;
check.Click += click_dirty;
check.SetResourceReference(CheckBox.ForegroundProperty, "Brush_Foreground");
_visualizations_list.Children.Add(check);
}
}

private void click_dirty(object sender, RoutedEventArgs e)
{
set_filter_dirty();
}

#endregion
Expand All @@ -190,6 +345,24 @@ protected virtual UIElement create_ui()
throw new InvalidOperationException("Should be implemented by inheriting class.");
}

private void _apply_button_click(object sender, RoutedEventArgs e)
{
var sender_button = sender as Button;
if (sender_button == null)
{
Log.Default.Msg(Log.Level.Error, "Unexpected sender");
return;
}
sender_button.IsEnabled = false;
_apply_button.SetResourceReference(Button.BackgroundProperty, "Brush_Background");
}

protected void set_filter_dirty()
{
_apply_button.IsEnabled = true;
_apply_button.SetResourceReference(Button.BackgroundProperty, "Brush_ApplyDirtyBackground");
}

#endregion

/* ------------------------------------------------------------------*/
Expand All @@ -201,17 +374,25 @@ private void event_apply_filter()
// call _get_selected_data_callback, modify all data and the call _update_selected_data_callback for all selected contents
}


#endregion

/* ------------------------------------------------------------------*/
#region private variables

private Grid _content = null;
private const double _margin = 5.0;


private bool _created = false;

private Border _content = null;
private RenameLabel _filter_caption = null;
private StackPanel _visualizations_list = null;
private Button _apply_button = null;

private DataManager.UpdateSelectedDataCallback_Delegate _update_selected_data_callback = null;
private DataManager.GetGenericDataCallback_Delegate _get_selected_data_callback = null;
private ModifyUIFilterList_Delegate _modify_ui_filter_list_callback = null;
private FilterManager.ModifyUIFilterList_Delegate _modify_ui_filter_list_callback = null;
private FilterManager.DeleteFilterCallback_Delegate _delete_self_callback = null;

#endregion
}
Expand Down
1 change: 0 additions & 1 deletion Core/Abstracts/AbstractMenuBar.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System;
using System.Windows.Navigation;
using System.Collections.Generic;
using static Core.GUI.MenubarMain;



Expand Down
6 changes: 0 additions & 6 deletions Core/Abstracts/AbstractVisualization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
using System.Windows;
using Core.GUI;
using Core.Data;
using System.Windows.Documents;
using System.Windows.Data;
using System.Globalization;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using System.Windows.Controls.Primitives;
using System.Windows.Input;



Expand Down
3 changes: 2 additions & 1 deletion Core/Abstracts/AbstractWindow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using ReadContentMetaData_Type = System.Tuple<string, bool, bool, string>;

using AttachContentMetaData_Type = System.Tuple<int, System.Windows.UIElement, Core.Abstracts.AbstractVisualization.AttachWindowMenu_Delegate>;
using System.Windows.Data;


namespace Core
Expand All @@ -27,7 +28,7 @@ public abstract class AbstractWindow

public delegate List<ReadContentMetaData_Type> AvailableContents_Delegate();

public delegate AttachContentMetaData_Type CreateContent_Delegate(int content_uid, string content_type);
public delegate AttachContentMetaData_Type CreateContent_Delegate(int content_uid, string content_type, Binding name_binding);

public delegate bool DeleteContent_Delegate(int content_uid);

Expand Down
1 change: 1 addition & 0 deletions Core/Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
</Compile>
<Compile Include="GUI\MenubarMain.cs" />
<Compile Include="GUI\ConfigurationService.cs" />
<Compile Include="GUI\RenameLabel.cs" />
<Compile Include="GUI\Windows\WindowBranch.cs" />
<Compile Include="GUI\Windows\WindowLeaf.cs" />
<Compile Include="Abstracts\AbstractService.cs" />
Expand Down
3 changes: 3 additions & 0 deletions Core/Filtering/ColumnSelectionFilter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ public class Configuration : AbstractFilter.Configuration
protected override UIElement create_ui()
{
var ui = new Grid();
_Name = "Column Selection";

ui.Height = 150;


return ui;
Expand Down
Loading

0 comments on commit 92ba4a0

Please sign in to comment.