Changeset 15622 for trunk

Timestamp:

01/17/18 11:29:03 (7 years ago)

Author:

fholzing

Message:

#2880: Removed now unnecessary workaround

File:

• trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

@@ -280 +280 @@
       double? yValue;
 
-      if (!xAxisComboBox.DroppedDown)
-        this.xAxisValue = (string)xAxisComboBox.SelectedItem;
-      if (!yAxisComboBox.DroppedDown)
-        this.yAxisValue = (string)yAxisComboBox.SelectedItem;
+      this.xAxisValue = (string)xAxisComboBox.SelectedItem;
+      this.yAxisValue = (string)yAxisComboBox.SelectedItem;
 
       xValue = GetValue(run, this.xAxisValue);
@@ -390 +388 @@
       Axis yAxis = this.chart.ChartAreas[BoxPlotChartAreaName].AxisY;
       int axisDimensionCount = Enum.GetNames(typeof(AxisDimension)).Count();
-      //mkommend: combobox.SelectedIndex could not be used as this changes during hovering over possible values
-      var xSAxisSelectedIndex = xAxisValue == null ? 0 : xAxisComboBox.Items.IndexOf(xAxisValue);
-      var ySAxisSelectedIndex = yAxisValue == null ? 0 : xAxisComboBox.Items.IndexOf(yAxisValue);
-      SetCustomAxisLabels(xAxis, xSAxisSelectedIndex - axisDimensionCount);
-      SetCustomAxisLabels(yAxis, ySAxisSelectedIndex - axisDimensionCount);
-      if (xAxisValue != null)
-        xAxis.Title = xAxisValue;
-      if (yAxisValue != null)
-        yAxis.Title = yAxisValue;
+
+      SetCustomAxisLabels(xAxis, xAxisComboBox.SelectedIndex - axisDimensionCount);
+      SetCustomAxisLabels(yAxis, yAxisComboBox.SelectedIndex - axisDimensionCount);
+
+      xAxis.Title = (string)xAxisComboBox.SelectedItem;
+      yAxis.Title = (string)yAxisComboBox.SelectedItem;
     }