Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/histogram

  • branches/histogram/HeuristicLab.Optimization.Views/3.3/HeuristicLabOptimizationViewsPlugin.cs.frame

    r5446 r6195  
    2626  /// Plugin class for HeuristicLab.Optimization.Views plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Optimization.Views", "3.3.3.$WCREV$")]
     28  [Plugin("HeuristicLab.Optimization.Views", "3.3.4.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Optimization.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • branches/histogram/HeuristicLab.Optimization.Views/3.3/Properties/AssemblyInfo.frame

    r5446 r6195  
    5454// by using the '*' as shown below:
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.3.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]

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

    r6046 r6195  
    227227      series.Points.Clear();
    228228      runToDataPointMapping.Clear();
     229
     230      chart.ChartAreas[0].AxisX.IsMarginVisible = xAxisValue != AxisDimension.Index.ToString();
     231      chart.ChartAreas[0].AxisY.IsMarginVisible = yAxisValue != AxisDimension.Index.ToString();
     232
    229233      if (Content != null) {
    230234        foreach (IRun run in this.Content)
    … …  
    433437    #region Drag & drop and tooltip
    434438    private void chart_MouseDoubleClick(object sender, MouseEventArgs e) {
    435       HitTestResult h = this.chart.HitTest(e.X, e.Y);
     439      HitTestResult h = this.chart.HitTest(e.X, e.Y, ChartElementType.DataPoint);
    436440      if (h.ChartElementType == ChartElementType.DataPoint) {
    437441        IRun run = (IRun)((DataPoint)h.Object).Tag;
    … …  
    445449        this.chart.ChartAreas[0].CursorY.SelectionStart = this.chart.ChartAreas[0].CursorY.SelectionEnd;
    446450      }
     451      UpdateAxisLabels();
    447452    }
    448453
    … …  
    557562      colorXAxisButton.Enabled = colorYAxisButton.Enabled = axisSelected;
    558563
    559       if (!xAxisComboBox.DroppedDown)
    560         xAxisValue = (string)xAxisComboBox.SelectedItem;
    561       if (!yAxisComboBox.DroppedDown)
    562         yAxisValue = (string)yAxisComboBox.SelectedItem;
    563       if (!sizeComboBox.DroppedDown)
    564         sizeAxisValue = (string)sizeComboBox.SelectedItem;
     564      xAxisValue = (string)xAxisComboBox.SelectedItem;
     565      yAxisValue = (string)yAxisComboBox.SelectedItem;
     566      sizeAxisValue = (string)sizeComboBox.SelectedItem;
    565567
    566568      UpdateDataPoints();
    … …  
    602604        for (double i = axis.Minimum; i <= axis.Maximum; i += axis.LabelStyle.Interval) {
    603605          TimeSpan time = TimeSpan.FromSeconds(i);
    604           string x = string.Format("{0:00}:{1:00}:{2:00}", (int)time.Hours, time.Minutes, time.Seconds);
     606          string x = string.Format("{0:00}:{1:00}:{2:00}", time.Hours, time.Minutes, time.Seconds);
    605607          axis.CustomLabels.Add(i - axis.LabelStyle.Interval / 2, i + axis.LabelStyle.Interval / 2, x);
    606608        }
Note: See TracChangeset for help on using the changeset viewer.