Changeset 6094 for trunk

Timestamp:

05/02/11 14:10:37 (14 years ago)

Author:

mkommend

Message:

#1413: Correct bugs in bubble chart (index starts with -1, double click on points that lie on axis, changing the axis value by a key stroke).

File:

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

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -433 +433 @@
     #region Drag & drop and tooltip
     private void chart_MouseDoubleClick(object sender, MouseEventArgs e) {
-      HitTestResult h = this.chart.HitTest(e.X, e.Y);
+      HitTestResult h = this.chart.HitTest(e.X, e.Y, ChartElementType.DataPoint);
       if (h.ChartElementType == ChartElementType.DataPoint) {
         IRun run = (IRun)((DataPoint)h.Object).Tag;
@@ -557 +557 @@
       colorXAxisButton.Enabled = colorYAxisButton.Enabled = axisSelected;
 
-      if (!xAxisComboBox.DroppedDown)
-        xAxisValue = (string)xAxisComboBox.SelectedItem;
-      if (!yAxisComboBox.DroppedDown)
-        yAxisValue = (string)yAxisComboBox.SelectedItem;
-      if (!sizeComboBox.DroppedDown)
-        sizeAxisValue = (string)sizeComboBox.SelectedItem;
+      xAxisValue = (string)xAxisComboBox.SelectedItem;
+      yAxisValue = (string)yAxisComboBox.SelectedItem;
+      sizeAxisValue = (string)sizeComboBox.SelectedItem;
+
+      chart.ChartAreas[0].AxisX.IsMarginVisible = xAxisValue != AxisDimension.Index.ToString() ;
+      chart.ChartAreas[0].AxisY.IsMarginVisible = yAxisValue != AxisDimension.Index.ToString();
 
       UpdateDataPoints();