Changeset 15256 for branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs
- Timestamp:
- 07/15/17 14:25:44 (7 years ago)
- Location:
- branches/PerformanceComparison/HeuristicLab.Optimization.Views
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/PerformanceComparison/HeuristicLab.Optimization.Views
- Property svn:mergeinfo changed
-
branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs
r14600 r15256 93 93 } 94 94 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 95 112 protected override void RegisterContentEvents() { 96 113 base.RegisterContentEvents(); … … 227 244 string[] additionalAxisDimension = Enum.GetNames(typeof(AxisDimension)); 228 245 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); 230 250 this.yAxisComboBox.Items.AddRange(additionalAxisDimension); 231 this.yAxisComboBox.Items.AddRange( Matrix.ColumnNames.ToArray());251 this.yAxisComboBox.Items.AddRange(sortedColumnNames); 232 252 string[] additionalSizeDimension = Enum.GetNames(typeof(SizeDimension)); 233 253 this.sizeComboBox.Items.AddRange(additionalSizeDimension); 234 this.sizeComboBox.Items.AddRange( Matrix.ColumnNames.ToArray());254 this.sizeComboBox.Items.AddRange(sortedColumnNames); 235 255 this.sizeComboBox.SelectedItem = SizeDimension.Constant.ToString(); 236 256 … … 726 746 } 727 747 private void hideRunsToolStripMenuItem_Click(object sender, EventArgs e) { 728 //ToList is necessary to prevent lazy evaluation 729 HideRuns(selectedRuns.ToList()); 748 HideRuns(selectedRuns); 730 749 //could not use ClearSelectedRuns as the runs are not visible anymore 731 750 selectedRuns.Clear(); 732 751 } 733 752 private void hideRunsButton_Click(object sender, EventArgs e) { 734 //ToList is necessary to prevent lazy evaluation 735 HideRuns(selectedRuns.ToList()); 753 HideRuns(selectedRuns); 736 754 //could not use ClearSelectedRuns as the runs are not visible anymore 737 755 selectedRuns.Clear(); … … 739 757 740 758 private void HideRuns(IEnumerable<IRun> runs) { 759 Content.UpdateOfRunsInProgress = true; 741 760 visibilityConstraint.Active = false; 742 761 if (!Content.Constraints.Contains(visibilityConstraint)) Content.Constraints.Add(visibilityConstraint); … … 745 764 } 746 765 visibilityConstraint.Active = true; 766 Content.UpdateOfRunsInProgress = false; 747 767 } 748 768
Note: See TracChangeset
for help on using the changeset viewer.