Changeset 14889 for trunk/sources/HeuristicLab.Optimization.Views/3.3
- Timestamp:
- 04/25/17 22:47:14 (8 years ago)
- Location:
- trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.Designer.cs
r14185 r14889 139 139 this.xAxisComboBox.Size = new System.Drawing.Size(400, 21); 140 140 this.xAxisComboBox.TabIndex = 7; 141 this.xAxisComboBox.Sorted = false; 141 142 this.xAxisComboBox.SelectedValueChanged += new System.EventHandler(this.AxisComboBox_SelectedValueChanged); 142 143 // … … 160 161 this.yAxisComboBox.Size = new System.Drawing.Size(400, 21); 161 162 this.yAxisComboBox.TabIndex = 5; 163 this.yAxisComboBox.Sorted = false; 162 164 this.yAxisComboBox.SelectedValueChanged += new System.EventHandler(this.AxisComboBox_SelectedValueChanged); 163 165 // … … 183 185 this.sizeComboBox.Name = "sizeComboBox"; 184 186 this.sizeComboBox.Size = new System.Drawing.Size(300, 21); 187 this.sizeComboBox.Sorted = false; 185 188 this.sizeComboBox.TabIndex = 14; 186 189 this.sizeComboBox.SelectedValueChanged += new System.EventHandler(this.AxisComboBox_SelectedValueChanged); … … 264 267 this.radioButtonGroup.Controls.Add(this.zoomButton); 265 268 this.radioButtonGroup.Controls.Add(this.selectButton); 266 this.radioButtonGroup.Location = new System.Drawing.Point( 3, 704);269 this.radioButtonGroup.Location = new System.Drawing.Point(6, 679); 267 270 this.radioButtonGroup.Name = "radioButtonGroup"; 268 271 this.radioButtonGroup.Size = new System.Drawing.Size(122, 32); … … 275 278 this.colorRunsButton.Enabled = false; 276 279 this.colorRunsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 277 this.colorRunsButton.Location = new System.Drawing.Point( 131, 713);280 this.colorRunsButton.Location = new System.Drawing.Point(6, 715); 278 281 this.colorRunsButton.Name = "colorRunsButton"; 279 282 this.colorRunsButton.Size = new System.Drawing.Size(21, 21); … … 317 320 this.transparencyTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 318 321 this.transparencyTrackBar.LargeChange = 16; 319 this.transparencyTrackBar.Location = new System.Drawing.Point( 302, 715);322 this.transparencyTrackBar.Location = new System.Drawing.Point(177, 717); 320 323 this.transparencyTrackBar.Maximum = 254; 321 324 this.transparencyTrackBar.Name = "transparencyTrackBar"; … … 331 334 this.hideRunsButton.Enabled = false; 332 335 this.hideRunsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 333 this.hideRunsButton.Location = new System.Drawing.Point( 172, 713);336 this.hideRunsButton.Location = new System.Drawing.Point(47, 715); 334 337 this.hideRunsButton.Name = "hideRunsButton"; 335 338 this.hideRunsButton.Size = new System.Drawing.Size(43, 21); … … 347 350 this.colorDialogButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 348 351 this.colorDialogButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 349 this.colorDialogButton.Location = new System.Drawing.Point( 152, 713);352 this.colorDialogButton.Location = new System.Drawing.Point(27, 715); 350 353 this.colorDialogButton.Name = "colorDialogButton"; 351 354 this.colorDialogButton.Size = new System.Drawing.Size(14, 21); … … 390 393 this.transparencyLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 391 394 this.transparencyLabel.AutoSize = true; 392 this.transparencyLabel.Location = new System.Drawing.Point( 233, 717);395 this.transparencyLabel.Location = new System.Drawing.Point(108, 719); 393 396 this.transparencyLabel.Name = "transparencyLabel"; 394 397 this.transparencyLabel.Size = new System.Drawing.Size(75, 13); -
trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs
r14185 r14889 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
Note: See TracChangeset
for help on using the changeset viewer.