Changeset 6195 for branches/histogram/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

Timestamp:

05/14/11 16:45:46 (13 years ago)

Author:

abeham

Message:

#1465

• updated branch with latest version of trunk

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs (modified) (5 diffs)

branches/histogram/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -227 +227 @@
       series.Points.Clear();
       runToDataPointMapping.Clear();
+
+      chart.ChartAreas[0].AxisX.IsMarginVisible = xAxisValue != AxisDimension.Index.ToString();
+      chart.ChartAreas[0].AxisY.IsMarginVisible = yAxisValue != AxisDimension.Index.ToString();
+
       if (Content != null) {
         foreach (IRun run in this.Content)
@@ -433 +437 @@
     #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;
@@ -445 +449 @@
         this.chart.ChartAreas[0].CursorY.SelectionStart = this.chart.ChartAreas[0].CursorY.SelectionEnd;
       }
+      UpdateAxisLabels();
     }
 
@@ -557 +562 @@
       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;
 
       UpdateDataPoints();
@@ -602 +604 @@
         for (double i = axis.Minimum; i <= axis.Maximum; i += axis.LabelStyle.Interval) {
           TimeSpan time = TimeSpan.FromSeconds(i);
-          string x = string.Format("{0:00}:{1:00}:{2:00}", (int)time.Hours, time.Minutes, time.Seconds);
+          string x = string.Format("{0:00}:{1:00}:{2:00}", time.Hours, time.Minutes, time.Seconds);
           axis.CustomLabels.Add(i - axis.LabelStyle.Interval / 2, i + axis.LabelStyle.Interval / 2, x);
         }