Changeset 15282 for branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.cs

Timestamp:

07/24/17 09:51:10 (7 years ago)

Author:

abeham

Message:

#2457: merged trunk into branch

Location:

branches/PerformanceComparison/HeuristicLab.Analysis.Views

Files:

• . (modified) (1 prop)
• 3.3/DataRowVisualPropertiesControl.cs (modified) (5 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.cs

@@ -46 +46 @@
       chartTypeComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowChartType));
       lineStyleComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowLineStyle));
-      aggregationComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowHistogramAggregation));
       clearColorButton.BackColor = Color.Transparent;
       clearColorButton.BackgroundImage = VSImageLibrary.Delete;
@@ -66 +65 @@
           startIndexZeroCheckBox.Checked = false;
           lineWidthNumericUpDown.Value = 1;
-          binsNumericUpDown.Value = 1;
-          binsApproximatelyRadioButton.Checked = false;
-          binsExactRadioButton.Checked = false;
-          aggregationComboBox.SelectedIndex = -1;
           displayNameTextBox.Text = String.Empty;
         } else {
@@ -91 +86 @@
             lineWidthNumericUpDown.Value = lineWidthNumericUpDown.Maximum;
           else lineWidthNumericUpDown.Value = Content.LineWidth;
-          if (Content.Bins < binsNumericUpDown.Minimum)
-            binsNumericUpDown.Value = binsNumericUpDown.Minimum;
-          else if (Content.Bins > binsNumericUpDown.Maximum)
-            binsNumericUpDown.Value = binsNumericUpDown.Maximum;
-          else binsNumericUpDown.Value = Content.Bins;
-          binsApproximatelyRadioButton.Checked = !Content.ExactBins;
-          binsExactRadioButton.Checked = Content.ExactBins;
-          aggregationComboBox.SelectedItem = Content.Aggregation;
           displayNameTextBox.Text = Content.DisplayName;
           isVisibleInLegendCheckBox.Checked = Content.IsVisibleInLegend;
@@ -110 +97 @@
       clearColorButton.Visible = Content != null && !Content.Color.IsEmpty;
       lineChartGroupBox.Enabled = Content != null && Content.ChartType == DataRowVisualProperties.DataRowChartType.Line;
-      histoGramGroupBox.Enabled = Content != null && Content.ChartType == DataRowVisualProperties.DataRowChartType.Histogram;
       isVisibleInLegendCheckBox.Enabled = Content != null;
     }
@@ -187 +173 @@
     }
 
-    private void binsNumericUpDown_ValueChanged(object sender, EventArgs e) {
-      if (!SuppressEvents && Content != null) {
-        Content.Bins = (int)binsNumericUpDown.Value;
-      }
-    }
-
-    private void binNumberRadioButton_CheckedChanged(object sender, EventArgs e) {
-      if (!SuppressEvents && Content != null) {
-        SuppressEvents = true;
-        try {
-          Content.ExactBins = binsExactRadioButton.Checked;
-        } finally { SuppressEvents = false; }
-      }
-    }
-
-    private void aggregationComboBox_SelectedValueChanged(object sender, EventArgs e) {
-      if (!SuppressEvents && Content != null) {
-        SuppressEvents = true;
-        try {
-          Content.Aggregation = (DataRowVisualProperties.DataRowHistogramAggregation)aggregationComboBox.SelectedValue;
-        } finally { SuppressEvents = false; }
-      }
-    }
-
     private void displayNameTextBox_Validated(object sender, EventArgs e) {
       if (!SuppressEvents && Content != null) {