Changeset 10877

Timestamp:

05/21/14 13:42:43 (11 years ago)

Author:

psteiner

Message:

Filters stored in Content
Preparation DataCompletenessChart

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/DataCompletenessView.Designer.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HistogramView.Designer.cs) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/DataCompletenessView.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HistogramView.cs) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingChartView.Designer.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.Designer.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs (modified) (7 diffs)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/DataCompletenessChartContent.cs (added)
• HeuristicLab.DataPreprocessing/3.3/Implementations/FilterContent.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingChartContent.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataCompletenessView.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.DataPreprocessing.Views {
-  partial class HistogramView {
+  partial class DataCompletenessView
+  {
     /// <summary> 
     /// Required designer variable.
@@ -24 +25 @@
     /// </summary>
     private void InitializeComponent() {
-      this.optionsBox = new System.Windows.Forms.GroupBox();
-      this.allInOneCheckBox = new System.Windows.Forms.CheckBox();
-      this.optionsBox.SuspendLayout();
+      this.dataTableView1 = new DataPreprocessing.Views.PreprocessingDataTableView();
       this.SuspendLayout();
       // 
-      // optionsBox
+      // dataTableView1
       // 
-      this.optionsBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.optionsBox.Controls.Add(this.allInOneCheckBox);
-      this.optionsBox.Location = new System.Drawing.Point(4, 263);
-      this.optionsBox.Name = "optionsBox";
-      this.optionsBox.Size = new System.Drawing.Size(152, 134);
-      this.optionsBox.TabIndex = 7;
-      this.optionsBox.TabStop = false;
-      this.optionsBox.Text = "Options";
+      this.dataTableView1.Caption = "DataTable View";
+      this.dataTableView1.Content = null;
+      this.dataTableView1.Location = new System.Drawing.Point(60, 36);
+      this.dataTableView1.Name = "dataTableView1";
+      this.dataTableView1.ReadOnly = false;
+      this.dataTableView1.Size = new System.Drawing.Size(359, 274);
+      this.dataTableView1.TabIndex = 0;
       // 
-      // allInOneCheckBox
+      // DataCompletenessView
       // 
-      this.allInOneCheckBox.AutoSize = true;
-      this.allInOneCheckBox.Location = new System.Drawing.Point(6, 19);
-      this.allInOneCheckBox.Name = "allInOneCheckBox";
-      this.allInOneCheckBox.Size = new System.Drawing.Size(69, 17);
-      this.allInOneCheckBox.TabIndex = 0;
-      this.allInOneCheckBox.Text = "All in one";
-      this.allInOneCheckBox.UseVisualStyleBackColor = true;
-      this.allInOneCheckBox.CheckedChanged += new System.EventHandler(this.allInOneCheckBox_CheckedChanged);
-      // 
-      // HistogramView
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.optionsBox);
-      this.Name = "HistogramView";
-      this.Controls.SetChildIndex(this.optionsBox, 0);
-      this.optionsBox.ResumeLayout(false);
-      this.optionsBox.PerformLayout();
+      this.Controls.Add(this.dataTableView1);
+      this.Name = "DataCompletenessView";
+      this.Size = new System.Drawing.Size(493, 344);
       this.ResumeLayout(false);
 
@@ -66 +49 @@
     #endregion
 
-    private System.Windows.Forms.GroupBox optionsBox;
-    private System.Windows.Forms.CheckBox allInOneCheckBox;
+    private HeuristicLab.DataPreprocessing.Views.PreprocessingDataTableView dataTableView1;
 
   }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataCompletenessView.cs

@@ -3 +3 @@
 using HeuristicLab.Analysis;
 using HeuristicLab.MainForm;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.DataPreprocessing.Views {
 
   [View("Histogram View")]
-  [Content(typeof(HistogramContent), true)]
-  public partial class HistogramView : PreprocessingChartView {
+  [Content(typeof(DataCompletenessChartContent), true)]
+  public partial class DataCompletenessView : ItemView {
 
-    private const string HISTOGRAM_CHART_TITLE = "Histogram";
+    protected DataRowVisualProperties.DataRowChartType chartType;
+    protected string chartTitle;
 
-    public HistogramView() {
-      InitializeComponent();
-      chartType = DataRowVisualProperties.DataRowChartType.Histogram;
-      chartTitle = HISTOGRAM_CHART_TITLE;
-    }
+    private const string DEFAULT_CHART_TITLE = "DataCompletenessChart";
 
-    public new HistogramContent Content {
-      get { return (HistogramContent)base.Content; }
+    public new DataCompletenessChartContent Content
+    {
+      get { return (DataCompletenessChartContent)base.Content; }
       set { base.Content = value; }
     }
 
-    private void allInOneCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (allInOneCheckBox.Checked)
-        Content.AllInOneMode = true;
-      else
-        Content.AllInOneMode = false;
-      GenerateChart();
+
+    public DataCompletenessView()
+    {
+      InitializeComponent();
+      chartType = DataRowVisualProperties.DataRowChartType.Line;
+      chartTitle = DEFAULT_CHART_TITLE;
     }
 
@@ -36 +35 @@
       if (Content != null)
       {
-        allInOneCheckBox.Checked = Content.AllInOneMode;
       }
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs

@@ -52 +52 @@
         var histogramLogic = new ChartLogic(data);
         var filterLogic = new FilterLogic(data);
+        var dataCompletenessLogic = new ChartLogic(data);
 
         var viewShortcuts = new ItemCollection<IViewShortcut> {
@@ -60 +61 @@
           new ManipulationContent(manipulationLogic, searchLogic),
           new LineChartContent(lineChartLogic),
-          new HistogramContent(histogramLogic)
+          new HistogramContent(histogramLogic)//,
+          //new DataCompletenessChartContent(dataCompletenessLogic)
         };
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs

@@ -20 +20 @@
       tbFiltered.Text = "0";
       tbPercentage.Text = "0%";
-      checkedFilterView.Content = new CheckedItemCollection<IFilter>();
-      checkedFilterView.Content.ItemsAdded += Content_ItemsAdded;
-      checkedFilterView.Content.ItemsRemoved += Content_ItemsRemoved;
-      checkedFilterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
+    }
+
+    private void InitData()
+    {
+        checkedFilterView.Content = Content.Filters;
+        checkedFilterView.Content.ItemsAdded += Content_ItemsAdded;
+        checkedFilterView.Content.ItemsRemoved += Content_ItemsRemoved;
+        checkedFilterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
     }
 
@@ -36 +40 @@
       if (Content != null)
       {
-        ImportFiltersFromContent();
+        InitData();
         UpdateFilterInfo();
       }
@@ -42 +46 @@
 
     private void Content_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
-      
-      foreach (IFilter filter in e.Items)
+      if (Content != null)
       {
-        filter.Active = checkedFilterView.Content.ItemChecked(filter);
+        foreach (IFilter filter in e.Items)
+        {
+          filter.Active = checkedFilterView.Content.ItemChecked(filter);
+        }
+        UpdateFilterInfo();
       }
-      UpdateFilterInfo();
-      ExportFiltersToContent();
-      Refresh();
-      ResumeRepaint(true);
     }
 
     private void UpdateFilterInfo() {
-      List<IFilter> filters = checkedFilterView.ItemCollection.ToList<IFilter>();
+        //List<IFilter> filters = checkedFilterView.ItemCollection.ToList<IFilter>();
+        List<IFilter> filters = Content.Filters.ToList();
 
-      int activeFilters = filters.Count(c => c.Active);
+        int activeFilters = filters.Count(c => c.Active);
 
-      applyFilterButton.Enabled = (activeFilters > 0);
-      rBtnAnd.Enabled = (activeFilters > 0);
-      rBtnOr.Enabled = (activeFilters > 0);
-      btnReset.Enabled = (activeFilters > 0);
-      Content.FilterLogic.Reset();
-      bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
-      
-      int filteredCnt = result.Count(c => c);
-  
-      tbFiltered.Text = filteredCnt.ToString();
-      double percentage = result.Length == 0 ? 0.0 : filteredCnt * 100 / result.Length;
-      tbPercentage.Text = percentage.ToString() + "%";
-      tbTotal.Text = result.Length.ToString();
+        applyFilterButton.Enabled = (activeFilters > 0);
+        rBtnAnd.Enabled = (activeFilters > 0);
+        rBtnOr.Enabled = (activeFilters > 0);
+        btnReset.Enabled = (activeFilters > 0);
+        Content.FilterLogic.Reset();
+        bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
+
+        int filteredCnt = result.Count(c => c);
+
+        tbFiltered.Text = filteredCnt.ToString();
+        double percentage = result.Length == 0 ? 0.0 : filteredCnt * 100 / result.Length;
+        tbPercentage.Text = percentage.ToString() + "%";
+        tbTotal.Text = result.Length.ToString();
     }
 
     private void applyFilterButton_Click(object sender, EventArgs e) {
-      List<IFilter> filters = checkedFilterView.ItemCollection.ToList<IFilter>();
-      Content.FilterLogic.Apply(filters, rBtnAnd.Checked);
+      if (Content != null)
+      {
+        List<IFilter> filters = Content.Filters.ToList();
+        Content.FilterLogic.Apply(filters, rBtnAnd.Checked);
+      }
     }
 
     //whenever a new filter is added the preprocessing data is set to the filter
     private void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
-      foreach (IFilter filter in e.Items) {
-        filter.ConstrainedValue = Content.FilterLogic.PreprocessingData;
+      if (Content != null)
+      {
+        foreach (IFilter filter in e.Items)
+        {
+          filter.ConstrainedValue = Content.FilterLogic.PreprocessingData;
+        }
+        UpdateFilterInfo();
       }
-      UpdateFilterInfo();
-      ExportFiltersToContent();
     }
 
     private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IFilter> e) {
-      UpdateFilterInfo();
-      ExportFiltersToContent();
+      if (Content != null)
+      {
+        UpdateFilterInfo();
+      }
     }
 
     private void rBtnAnd_CheckedChanged(object sender, EventArgs e)
     {
-      UpdateFilterInfo();
-      ExportFiltersToContent();
-      Content.isAndCombination = rBtnAnd.Checked;
+      if (Content != null)
+      {
+        UpdateFilterInfo();
+        Content.isAndCombination = rBtnAnd.Checked;
+      }
     }
 
     private void btnReset_Click(object sender, EventArgs e)
     {
-      Content.FilterLogic.Reset();
-    }
-
-    private void ImportFiltersFromContent()
-    {
-      checkedFilterView.ItemCollection.AddRange(Content.Filters);
-
-      foreach (IFilter filter in checkedFilterView.ItemCollection) {
-        if (filter.Active)
-        {
-          checkedFilterView.Content.SetItemCheckedState(filter, true);
-        }
-        else
-        {
-          checkedFilterView.Content.SetItemCheckedState(filter, false);
-        }
-        rBtnAnd.Checked = Content.isAndCombination;
-        rBtnOr.Checked = !Content.isAndCombination;
+      if (Content != null)
+      {
+        Content.FilterLogic.Reset();
       }
     }
 
-    private void ExportFiltersToContent()
-    {
-      Content.Filters = checkedFilterView.ItemCollection.ToList<IFilter>();
-    }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

@@ -82 +82 @@
       <DependentUpon>ComparisonFilterView.cs</DependentUpon>
     </Compile>
+    <Compile Include="DataCompletenessView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DataCompletenessView.Designer.cs">
+      <DependentUpon>DataCompletenessView.cs</DependentUpon>
+    </Compile>
     <Compile Include="DataGridContentView.cs">
       <SubType>UserControl</SubType>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingChartView.Designer.cs

@@ -46 +46 @@
     /// </summary>
     private void InitializeComponent() {
-      this.dataTableView = new HeuristicLab.Analysis.Views.PreprocessingDataTableView();
+      this.dataTableView = new DataPreprocessing.Views.PreprocessingDataTableView();
       this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
       this.checkedItemList = new HeuristicLab.DataPreprocessing.Views.PreprocessingCheckedItemListView();
@@ -108 +108 @@
 
     private PreprocessingCheckedItemListView checkedItemList;
-    private Analysis.Views.PreprocessingDataTableView dataTableView;
+    private DataPreprocessing.Views.PreprocessingDataTableView dataTableView;
     private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
   }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Analysis.Views {
+namespace HeuristicLab.DataPreprocessing.Views
+{
   partial class PreprocessingDataTableView {
     /// <summary> 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs

@@ -30 +30 @@
 using HeuristicLab.DataPreprocessing.Implementations;
 using HeuristicLab.MainForm;
-
-namespace HeuristicLab.Analysis.Views
+using HeuristicLab.Analysis;
+using HeuristicLab.Analysis.Views;
+
+namespace HeuristicLab.DataPreprocessing.Views
 {
   [View("Preprocessing DataTable View")]
@@ -150 +152 @@
           dialog.ShowDialog(this);
         }
-      }
+    }
       else MessageBox.Show("Nothing to configure.");
     }
@@ -166 +168 @@
         if (classification == null)
         {
-          chart.Series.Add(series);
-        }
+        chart.Series.Add(series);
+      }
       }
 
@@ -182 +184 @@
         // add dummy series for selction entry in legend
         if (rows.Count() > 0 && chart.Series.FindByName("(Selection)") == null) {
-          Series series = new Series("(Selection)");
-          series.IsVisibleInLegend = true;
-          series.Color = Color.Green;
-          series.BorderWidth = 1;
-          series.BorderDashStyle = ChartDashStyle.Solid;
-          series.BorderColor = Color.Empty;
-          series.ChartType = SeriesChartType.FastLine;
-          chart.Series.Add(series);
-        }
-
-        foreach (var row in rows) {
+        Series series = new Series("(Selection)");
+        series.IsVisibleInLegend = true;
+        series.Color = Color.Green;
+        series.BorderWidth = 1;
+        series.BorderDashStyle = ChartDashStyle.Solid;
+        series.BorderColor = Color.Empty;
+        series.ChartType = SeriesChartType.FastLine;
+        chart.Series.Add(series);
+      }
+
+      foreach (var row in rows) {
           row.VisualProperties.IsVisibleInLegend = false;
           row.VisualProperties.Color = Color.Green;
@@ -201 +203 @@
 
           if (classification == null) {
-            chart.Series.Add(series);
-          }
-        }
-      }
+          chart.Series.Add(series);
+        }
+      }
+    }
     }
 
@@ -212 +214 @@
       if (rows.Count() > 0 && rows.ElementAt(0).VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Line) 
       {
-        //remove selection entry in legend
-        if (Content.SelectedRows.Count == 0) {
-          Series series = chart.Series["(Selection)"];
-          chart.Series.Remove(series);
-        }
-
-        foreach (var row in rows) {
-          Series series = chart.Series[row.Name + "(Selected)"];
-          chart.Series.Remove(series);
-        }
-      }
+      //remove selection entry in legend
+      if (Content.SelectedRows.Count == 0) {
+        Series series = chart.Series["(Selection)"];
+        chart.Series.Remove(series);
+      }
+
+      foreach (var row in rows) {
+        Series series = chart.Series[row.Name + "(Selected)"];
+        chart.Series.Remove(series);
+      }
+    }
     }
 
@@ -755 +757 @@
       else
       {
-        series.Points.Clear();
+      series.Points.Clear();
         ConfigureSeries(series, row);
         AddPointsToHistogramSeries(series, row, null);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -72 +72 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Implementations\DataCompletenessChartContent.cs" />
     <Compile Include="Implementations\FilteredPreprocessingData.cs" />
     <Compile Include="Implementations\ManipulationContent.cs" />

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterContent.cs

@@ -30 +30 @@
   public class FilterContent : Item, IViewShortcut {
 
-    private IList<IFilter> filters = new List<IFilter>();
+    private ICheckedItemCollection<IFilter> filters = new CheckedItemCollection<IFilter>();
 
     public static new Image StaticItemImage {
@@ -50 +50 @@
     }
 
-    public IList<IFilter> Filters
+    public ICheckedItemCollection<IFilter> Filters
     {
       get

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingChartContent.cs

@@ -37 +37 @@
 
     private readonly IChartLogic chartLogic;
+
+
     public PreprocessingChartContent(IChartLogic chartLogic) {
       this.chartLogic = chartLogic;