Changeset 10947 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.cs

Timestamp:

06/04/14 14:57:45 (10 years ago)

Author:

rstoll

Message:

• Changed ComparisonFilter, using DoubleValue and DateTime rather than just StringValue
• Included better input validation for ComparisonFilterView
• Bug "Search and Sorted DataGridContentView" fixed

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.cs (modified) (9 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Linq;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.DataPreprocessing.Filter;
 using HeuristicLab.MainForm;
-using System.Collections;
-using System;
-using System.Collections.Generic;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -44 +42 @@
 
 
-    protected override void OnContentChanged()
-    {
+    protected override void OnContentChanged() {
       base.OnContentChanged();
       cbAttr.Items.Clear(); //cmbConstraintColumn.Items.Clear();
       cbFilterOperation.Items.Clear(); //cmbConstraintOperation.Items.Clear();
       tbFilterData.Text = string.Empty;
-      if (Content != null)
-      {
+      if (Content != null) {
         cbFilterOperation.Items.AddRange(Content.AllowedConstraintOperations.ToArray());
         if (Content.ConstraintOperation != null)
@@ -59 +55 @@
         UpdateColumnComboBox();
         ReadOnly = Content.Active;
-        if (Content.ConstraintData != null)
-        {
+        if (Content.ConstraintData != null) {
           tbFilterData.Text = Content.ConstraintData.GetValue();
-        }
-        else
-        {
+        } else {
           this.Content_ConstraintColumnChanged(cbAttr, EventArgs.Empty); // TODO
         }
       }
-      if (Content == null || Content.ConstraintData == null)
-      {
+      if (Content == null || Content.ConstraintData == null) {
         tbFilterData.Text = string.Empty;
-      }
-      else
-      {
+      } else {
         tbFilterData.Text = Content.ConstraintData.GetValue();
       }
     }
 
-    protected virtual void UpdateColumnComboBox()
-    {
+    protected virtual void UpdateColumnComboBox() {
       this.cbAttr.Items.Clear();
-      if (Content.ConstrainedValue != null)
-      {
+      if (Content.ConstrainedValue != null) {
         this.cbAttr.Items.AddRange(Content.ConstrainedValue.VariableNames.ToArray<string>());
         //if (!string.IsNullOrEmpty(Content.ConstraintColumn))
@@ -89 +77 @@
         //if (Content.ConstraintColumn != null)
         //{
-          cbAttr.SelectedItem = Content.ConstraintColumn;
-          if (Content.ConstraintData != null)
-            tbFilterData.Text = Content.ConstraintData.GetValue();
-          else
-            this.Content_ConstraintColumnChanged(cbAttr, EventArgs.Empty);
+        cbAttr.SelectedItem = Content.ConstraintColumn;
+        if (Content.ConstraintData != null)
+          tbFilterData.Text = Content.ConstraintData.GetValue();
+        else
+          this.Content_ConstraintColumnChanged(cbAttr, EventArgs.Empty);
         //}
       }
     }
 
-    protected override void RegisterContentEvents()
-    {
+    protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
       this.Content.ActiveChanged += new EventHandler(Content_ActiveChanged);
@@ -108 +95 @@
     }
 
-    protected override void DeregisterContentEvents()
-    {
+    protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
       this.Content.ActiveChanged -= new EventHandler(Content_ActiveChanged);
@@ -118 +104 @@
     }
 
-    protected virtual void Content_ConstrainedValueChanged(object sender, EventArgs e)
-    {
+    protected virtual void Content_ConstrainedValueChanged(object sender, EventArgs e) {
       this.UpdateColumnComboBox();
     }
 
-    private void Content_ConstrainedDataChanged(object sender, EventArgs e)
-    {
+    private void Content_ConstrainedDataChanged(object sender, EventArgs e) {
       if (Content.ConstraintData != null)
         tbFilterData.Text = Content.ConstraintData.GetValue();
@@ -131 +115 @@
     }
 
-    protected virtual void Content_ConstraintColumnChanged(object sender, EventArgs e)
-    {
-      if (Content.ConstrainedValue != null)
-      {
-        if (cbAttr.Items.IndexOf(cbAttr.SelectedItem) != Content.ConstraintColumn)
-        {
+    protected virtual void Content_ConstraintColumnChanged(object sender, EventArgs e) {
+      if (Content.ConstrainedValue != null) {
+        if (cbAttr.Items.IndexOf(cbAttr.SelectedItem) != Content.ConstraintColumn) {
           cbAttr.SelectedItem = this.cbAttr.Items[Content.ConstraintColumn];
         }
       }
-      if (Content.ConstraintData == null)
-        this.Content.ConstraintData = new StringValue();
+      if (Content.ConstraintData == null) {
+        this.Content.ConstraintData = CreateStringConvertibleValue(cbAttr.SelectedIndex);
+      }
     }
 
 
-    protected virtual void Content_ComparisonOperationChanged(object sender, EventArgs e)
-    {
+    protected virtual void Content_ComparisonOperationChanged(object sender, EventArgs e) {
       if (Content.ConstraintOperation != (ConstraintOperation)this.cbFilterOperation.SelectedItem)
         this.cbFilterOperation.SelectedItem = Content.ConstraintOperation;
     }
 
-    protected override void SetEnabledStateOfControls()
-    {
+    protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
       /*
@@ -165 +145 @@
     }
 
-    private void cbAttr_SelectedIndexChanged(object sender, EventArgs e)
-    {
-      if (Content.ConstrainedValue != null)
-      {
+    private void cbAttr_SelectedIndexChanged(object sender, EventArgs e) {
+      if (Content.ConstrainedValue != null) {
         Content.ConstraintColumn = Content.ConstrainedValue.GetColumnIndex(cbAttr.SelectedItem.ToString());
       }
     }
 
-    private void cbFilterOperation_SelectedIndexChanged(object sender, EventArgs e)
-    {
+    private void cbFilterOperation_SelectedIndexChanged(object sender, EventArgs e) {
       Content.ConstraintOperation = (ConstraintOperation)this.cbFilterOperation.SelectedItem;
     }
 
-    protected virtual void Content_ActiveChanged(object sender, EventArgs e)
-    {
+    protected virtual void Content_ActiveChanged(object sender, EventArgs e) {
       this.ReadOnly = !Content.Active;
       SetEnabledStateOfControls();
@@ -185 +161 @@
     }
 
-    private void tbFilterData_Validated(object sender, EventArgs e)
-    {
-      IStringConvertibleValue value = new StringValue();
-        value.SetValue(tbFilterData.Text);
-        Content.ConstraintData = value;
+    private void tbFilterData_Validated(object sender, EventArgs e) {
+      IStringConvertibleValue value = CreateStringConvertibleValue(cbAttr.SelectedIndex);
+      value.SetValue(tbFilterData.Text);
+      Content.ConstraintData = value;
     }
 
-    private void tbFilterData_Validating(object sender, System.ComponentModel.CancelEventArgs e)
-    {
-        string errorMessage = string.Empty;
-        if (!Content.ConstraintData.Validate(tbFilterData.Text, out errorMessage))
-        {
-          errorProvider.SetError(tbFilterData, errorMessage);
-          e.Cancel = true;
-        }
-        else
-          errorProvider.Clear();
+    private IStringConvertibleValue CreateStringConvertibleValue(int columnIndex) {
+      IStringConvertibleValue value;
+      if (Content.ConstrainedValue.IsType<double>(columnIndex)) {
+        value = new DoubleValue();
+      } else if (Content.ConstrainedValue.IsType<String>(columnIndex)) {
+        value = new StringValue();
+      } else if (Content.ConstrainedValue.IsType<DateTime>(columnIndex)) {
+        value = new DateTimeValue();
+      } else {
+        throw new ArgumentException("unsupported type");
+      }
+      return value;
+    }
+
+    private void tbFilterData_Validating(object sender, System.ComponentModel.CancelEventArgs e) {
+      string errorMessage = string.Empty;
+      if (!Content.ConstraintData.Validate(tbFilterData.Text, out errorMessage)) {
+        errorProvider.SetError(tbFilterData, errorMessage);
+        e.Cancel = true;
+      } else
+        errorProvider.Clear();
     }