- Timestamp:
- 06/30/17 16:41:06 (7 years ago)
- Location:
- stable
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 14435-14439,14457-14458,14493,14508,14516,14519,14582,14740,14860-14861,14982,14984,14987,14992,15042,15068,15095
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Analysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Analysis merged: 14493,14582,15068
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs
r14186 r15097 123 123 } 124 124 } 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 145 126 private double scaleFactor; 146 127 public double ScaleFactor { … … 215 196 set { lineWidth = value; } 216 197 } 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 }227 198 [Storable(Name = "ScaleFactor")] 228 199 private double StorableScaleFactor { … … 240 211 set { displayName = value; } 241 212 } 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; } } 242 232 #endregion 243 233 … … 253 243 this.startIndexZero = original.startIndexZero; 254 244 this.lineWidth = original.lineWidth; 255 this.bins = original.bins;256 this.exactBins = original.exactBins;257 245 this.scaleFactor = original.scaleFactor; 258 246 this.displayName = original.displayName; … … 267 255 startIndexZero = false; 268 256 lineWidth = 1; 269 bins = 10;270 exactBins = false;271 257 scaleFactor = 1.0; 272 258 displayName = String.Empty; … … 294 280 if (secondXAxis == default(bool) 295 281 && lineStyle == default(DataRowLineStyle) 296 && lineWidth == default(int) && bins == default(int) && exactBins == default(bool)297 282 && displayName == default(string)) { 298 283 secondXAxis = false; 299 284 lineStyle = DataRowLineStyle.Solid; 300 285 lineWidth = 1; 301 bins = 10;302 exactBins = false;303 286 displayName = String.Empty; 304 287 }
Note: See TracChangeset
for help on using the changeset viewer.