Changeset 16048 for stable


Ignore:
Timestamp:
08/06/18 14:08:48 (14 months ago)
Author:
mkommend
Message:

#2880: Merged r15621, r15622, r15623, r15672, r15754, r15755 into stable.

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimization.Views

  • stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.Designer.cs

    r16047 r16048  
    113113      // chart
    114114      //
    115       this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    116             | System.Windows.Forms.AnchorStyles.Left)
     115      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     116            | System.Windows.Forms.AnchorStyles.Left) 
    117117            | System.Windows.Forms.AnchorStyles.Right)));
    118118      chartArea1.Name = "ChartArea1";
     
    191191      // statisticsGroupBox
    192192      //
    193       this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    194             | System.Windows.Forms.AnchorStyles.Left)
     193      this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     194            | System.Windows.Forms.AnchorStyles.Left) 
    195195            | System.Windows.Forms.AnchorStyles.Right)));
    196196      this.statisticsGroupBox.Controls.Add(this.statisticsMatrixView);
  • stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

    r16047 r16048  
    280280      double? yValue;
    281281
    282       if (!xAxisComboBox.DroppedDown)
    283         this.xAxisValue = (string)xAxisComboBox.SelectedItem;
    284       if (!yAxisComboBox.DroppedDown)
    285         this.yAxisValue = (string)yAxisComboBox.SelectedItem;
     282      this.xAxisValue = (string)xAxisComboBox.SelectedItem;
     283      this.yAxisValue = (string)yAxisComboBox.SelectedItem;
    286284
    287285      xValue = GetValue(run, this.xAxisValue);
     
    386384      UpdateDataPoints();
    387385    }
     386
    388387    private void UpdateAxisLabels() {
    389388      Axis xAxis = this.chart.ChartAreas[BoxPlotChartAreaName].AxisX;
    390389      Axis yAxis = this.chart.ChartAreas[BoxPlotChartAreaName].AxisY;
    391390      int axisDimensionCount = Enum.GetNames(typeof(AxisDimension)).Count();
    392       //mkommend: combobox.SelectedIndex could not be used as this changes during hovering over possible values
    393       var xSAxisSelectedIndex = xAxisValue == null ? 0 : xAxisComboBox.Items.IndexOf(xAxisValue);
    394       var ySAxisSelectedIndex = yAxisValue == null ? 0 : xAxisComboBox.Items.IndexOf(yAxisValue);
    395       SetCustomAxisLabels(xAxis, xSAxisSelectedIndex - axisDimensionCount);
    396       SetCustomAxisLabels(yAxis, ySAxisSelectedIndex - axisDimensionCount);
    397       if (xAxisValue != null)
    398         xAxis.Title = xAxisValue;
    399       if (yAxisValue != null)
    400         yAxis.Title = yAxisValue;
     391
     392      SetCustomAxisLabels(xAxis, xAxisComboBox.SelectedIndex - axisDimensionCount);
     393      SetCustomAxisLabels(yAxis, yAxisComboBox.SelectedIndex - axisDimensionCount);
     394
     395      xAxis.Title = (string)xAxisComboBox.SelectedItem;
     396      yAxis.Title = (string)yAxisComboBox.SelectedItem;
    401397    }
    402398
     
    406402
    407403    private void SetCustomAxisLabels(Axis axis, int dimension) {
     404      if (Content == null) { return; }
     405      if (!Content.Any()) { return; }
     406
    408407      axis.CustomLabels.Clear();
    409408      if (categoricalMapping.ContainsKey(dimension)) {
Note: See TracChangeset for help on using the changeset viewer.