Ignore:
Timestamp:
06/30/17 16:41:06 (2 years ago)
Author:
pfleck
Message:

#2713 #2715 #2765
Merged to stable

  • 14435-14439,14493,14516,14519,14982,14987,14992,15042 (from #2713)
  • 14457-14458,14508,14582,14740,14984,15068,15095 (from #2715)
  • 14860-14861 (from #2765)
Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Analysis

  • stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

    r14186 r15097  
    123123      }
    124124    }
    125     private int bins;
    126     public int Bins {
    127       get { return bins; }
    128       set {
    129         if (bins != value) {
    130           bins = value;
    131           OnPropertyChanged("Bins");
    132         }
    133       }
    134     }
    135     private bool exactBins;
    136     public bool ExactBins {
    137       get { return exactBins; }
    138       set {
    139         if (exactBins != value) {
    140           exactBins = value;
    141           OnPropertyChanged("ExactBins");
    142         }
    143       }
    144     }
     125
    145126    private double scaleFactor;
    146127    public double ScaleFactor {
     
    215196      set { lineWidth = value; }
    216197    }
    217     [Storable(Name = "Bins")]
    218     private int StorableBins {
    219       get { return bins; }
    220       set { bins = value; }
    221     }
    222     [Storable(Name = "ExactBins")]
    223     private bool StorableExactBins {
    224       get { return exactBins; }
    225       set { exactBins = value; }
    226     }
    227198    [Storable(Name = "ScaleFactor")]
    228199    private double StorableScaleFactor {
     
    240211      set { displayName = value; }
    241212    }
     213    #endregion
     214
     215    #region Histogram Properties - Backwards Compatability
     216    internal enum DataRowHistogramAggregation {
     217      Overlapping,
     218      SideBySide,
     219      Stacked
     220    }
     221
     222    internal int? Bins { get; private set; }
     223    internal bool? ExactBins { get; private set; }
     224    internal DataRowHistogramAggregation? Aggregation { get; private set; }
     225
     226    [Storable(Name = "Bins", AllowOneWay = true)]
     227    private int StorableBins { set { Bins = value; } }
     228    [Storable(Name = "ExactBins", AllowOneWay = true)]
     229    private bool StorableExactBins { set { ExactBins = value; } }
     230    [Storable(Name = "Aggregation", AllowOneWay = true)]
     231    private DataRowHistogramAggregation StorableAggregation { set { Aggregation = value; } }
    242232    #endregion
    243233
     
    253243      this.startIndexZero = original.startIndexZero;
    254244      this.lineWidth = original.lineWidth;
    255       this.bins = original.bins;
    256       this.exactBins = original.exactBins;
    257245      this.scaleFactor = original.scaleFactor;
    258246      this.displayName = original.displayName;
     
    267255      startIndexZero = false;
    268256      lineWidth = 1;
    269       bins = 10;
    270       exactBins = false;
    271257      scaleFactor = 1.0;
    272258      displayName = String.Empty;
     
    294280      if (secondXAxis == default(bool)
    295281        && lineStyle == default(DataRowLineStyle)
    296         && lineWidth == default(int) && bins == default(int) && exactBins == default(bool)
    297282        && displayName == default(string)) {
    298283        secondXAxis = false;
    299284        lineStyle = DataRowLineStyle.Solid;
    300285        lineWidth = 1;
    301         bins = 10;
    302         exactBins = false;
    303286        displayName = String.Empty;
    304287      }
Note: See TracChangeset for help on using the changeset viewer.