Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/15/17 14:25:44 (7 years ago)
Author:
abeham
Message:

#2457: merged trunk into branch

Location:
branches/PerformanceComparison/HeuristicLab.Optimization.Views
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/PerformanceComparison/HeuristicLab.Optimization.Views

  • branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs

    r14600 r15256  
    9393    }
    9494
     95    public string SelectedXAxis {
     96      get { return xAxisValue; }
     97      set {
     98        if (xAxisComboBox.Items.Contains(value)) {
     99          xAxisComboBox.SelectedItem = value;
     100        }
     101      }
     102    }
     103    public string SelectedYAxis {
     104      get { return yAxisValue; }
     105      set {
     106        if (yAxisComboBox.Items.Contains(value)) {
     107          yAxisComboBox.SelectedItem = value;
     108        }
     109      }
     110    }
     111
    95112    protected override void RegisterContentEvents() {
    96113      base.RegisterContentEvents();
     
    227244        string[] additionalAxisDimension = Enum.GetNames(typeof(AxisDimension));
    228245        this.xAxisComboBox.Items.AddRange(additionalAxisDimension);
    229         this.xAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
     246        var comparer = new HeuristicLab.Common.NaturalStringComparer();
     247        var sortedColumnNames = Matrix.ColumnNames.ToArray();
     248        sortedColumnNames.StableSort(comparer);
     249        this.xAxisComboBox.Items.AddRange(sortedColumnNames);
    230250        this.yAxisComboBox.Items.AddRange(additionalAxisDimension);
    231         this.yAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
     251        this.yAxisComboBox.Items.AddRange(sortedColumnNames);
    232252        string[] additionalSizeDimension = Enum.GetNames(typeof(SizeDimension));
    233253        this.sizeComboBox.Items.AddRange(additionalSizeDimension);
    234         this.sizeComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
     254        this.sizeComboBox.Items.AddRange(sortedColumnNames);
    235255        this.sizeComboBox.SelectedItem = SizeDimension.Constant.ToString();
    236256
     
    726746    }
    727747    private void hideRunsToolStripMenuItem_Click(object sender, EventArgs e) {
    728       //ToList is necessary to prevent lazy evaluation
    729       HideRuns(selectedRuns.ToList());
     748      HideRuns(selectedRuns);
    730749      //could not use ClearSelectedRuns as the runs are not visible anymore
    731750      selectedRuns.Clear();
    732751    }
    733752    private void hideRunsButton_Click(object sender, EventArgs e) {
    734       //ToList is necessary to prevent lazy evaluation
    735       HideRuns(selectedRuns.ToList());
     753      HideRuns(selectedRuns);
    736754      //could not use ClearSelectedRuns as the runs are not visible anymore
    737755      selectedRuns.Clear();
     
    739757
    740758    private void HideRuns(IEnumerable<IRun> runs) {
     759      Content.UpdateOfRunsInProgress = true;
    741760      visibilityConstraint.Active = false;
    742761      if (!Content.Constraints.Contains(visibilityConstraint)) Content.Constraints.Add(visibilityConstraint);
     
    745764      }
    746765      visibilityConstraint.Active = true;
     766      Content.UpdateOfRunsInProgress = false;
    747767    }
    748768
Note: See TracChangeset for help on using the changeset viewer.