- Timestamp:
- 12/14/10 11:30:55 (14 years ago)
- Location:
- trunk/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs
r4778 r5097 120 120 #endregion 121 121 122 pr ivateHeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart;122 protected HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart; 123 123 124 124 } -
trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs
r4870 r5097 36 36 [View("DataTable View")] 37 37 [Content(typeof(DataTable), true)] 38 public sealedpartial class DataTableView : NamedItemView {39 pr ivateList<Series> invisibleSeries;40 pr ivateDictionary<IObservableList<double>, DataRow> valuesRowsTable;38 public partial class DataTableView : NamedItemView { 39 protected List<Series> invisibleSeries; 40 protected Dictionary<IObservableList<double>, DataRow> valuesRowsTable; 41 41 /// <summary> 42 42 /// Gets or sets the variable to represent visually. … … 113 113 } 114 114 115 private void AddDataRow(DataRow row) { 115 116 /// <summary> 117 /// Add the DataRow as a series to the chart. 118 /// </summary> 119 /// <param name="row">DataRow to add as series to the chart.</param> 120 protected virtual void AddDataRow(DataRow row) { 116 121 Series series = new Series(row.Name); 117 122 switch (row.VisualProperties.ChartType) { … … 141 146 } 142 147 143 private void UpdateYCursorInterval() { 148 149 /// <summary> 150 /// Set the Y Cursor interval to visible points of enabled series. 151 /// </summary> 152 protected virtual void UpdateYCursorInterval() { 144 153 double interestingValuesRange = (from series in chart.Series 145 154 where series.Enabled … … 159 168 } 160 169 161 private void RemoveDataRow(DataRow row) { 170 171 /// <summary> 172 /// Remove the corresponding series for a certain DataRow. 173 /// </summary> 174 /// <param name="row">DataRow which series should be removed.</param> 175 protected virtual void RemoveDataRow(DataRow row) { 162 176 Series series = chart.Series[row.Name]; 163 177 chart.Series.Remove(series); … … 168 182 169 183 #region Content Events 170 private void RegisterDataRowEvents(DataRow row) { 184 /// <summary> 185 /// Automatically called for every existing data row and whenever a data row is added 186 /// to the data table. Do not call this method directly. 187 /// </summary> 188 /// <param name="row">The DataRow that was added.</param> 189 protected virtual void RegisterDataRowEvents(DataRow row) { 171 190 row.NameChanged += new EventHandler(Row_NameChanged); 172 191 row.VisualPropertiesChanged += new EventHandler(Row_VisualPropertiesChanged); … … 178 197 row.Values.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_CollectionReset); 179 198 } 180 private void DeregisterDataRowEvents(DataRow row) { 199 200 /// <summary> 201 /// Automatically called for every data row that is removed from the DataTable. Do 202 /// not directly call this method. 203 /// </summary> 204 /// <param name="row">The DataRow that was removed.</param> 205 protected virtual void DeregisterDataRowEvents(DataRow row) { 181 206 row.Values.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_ItemsAdded); 182 207 row.Values.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_ItemsRemoved); … … 436 461 #endregion 437 462 438 private bool IsInvalidValue(double x) { 463 464 /// <summary> 465 /// Determines whether a double value can be displayed (converted to Decimal and not an NaN). 466 /// </summary> 467 /// <param name="x">The number to check.</param> 468 /// <returns><code>true</code> if the value can be safely shwon in the chart, 469 /// <code>false</code> otherwise.</returns> 470 protected static bool IsInvalidValue(double x) { 439 471 return double.IsNaN(x) || x < (double)decimal.MinValue || x > (double)decimal.MaxValue; 440 472 } -
trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs
r4887 r5097 34 34 [Item("DataRow", "A row of data values.")] 35 35 [StorableClass] 36 public sealed class DataRow : NamedItem { 36 public class DataRow : NamedItem { 37 [Storable(Name = "VisualProperties")] 37 38 private DataRowVisualProperties visualProperties; 38 39 public DataRowVisualProperties VisualProperties { … … 54 55 55 56 #region Persistence Properties 56 [Storable(Name = "VisualProperties")]57 private DataRowVisualProperties StorableVisualProperties {58 get { return VisualProperties; }59 set { VisualProperties = value; }60 }61 57 [Storable(Name = "values")] 62 58 private IEnumerable<double> StorableValues { … … 67 63 68 64 [StorableConstructor] 69 pr ivateDataRow(bool deserializing) : base(deserializing) { }70 pr ivateDataRow(DataRow original, Cloner cloner)65 protected DataRow(bool deserializing) : base(deserializing) { } 66 protected DataRow(DataRow original, Cloner cloner) 71 67 : base(original, cloner) { 72 68 this.VisualProperties = (DataRowVisualProperties)cloner.Clone(original.visualProperties); … … 107 103 108 104 public event EventHandler VisualPropertiesChanged; 109 pr ivatevoid OnVisualPropertiesChanged() {105 protected virtual void OnVisualPropertiesChanged() { 110 106 EventHandler handler = VisualPropertiesChanged; 111 107 if (handler != null) handler(this, EventArgs.Empty); -
trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs
r4887 r5097 37 37 [Item("DataTable", "A table of data values.")] 38 38 [StorableClass] 39 public sealedclass DataTable : NamedItem, IStringConvertibleMatrix {39 public class DataTable : NamedItem, IStringConvertibleMatrix { 40 40 public override Image ItemImage { 41 41 get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Performance; } 42 42 } 43 43 44 [Storable(Name = "VisualProperties")] 44 45 private DataTableVisualProperties visualProperties; 45 46 public DataTableVisualProperties VisualProperties { … … 62 63 63 64 #region Persistence Properties 64 [Storable(Name = "VisualProperties")]65 private DataTableVisualProperties StorableVisualProperties {66 get { return VisualProperties; }67 set { VisualProperties = value; }68 }69 65 [Storable(Name = "rows")] 70 66 private IEnumerable<DataRow> StorableRows { … … 75 71 76 72 [StorableConstructor] 77 pr ivateDataTable(bool deserializing) : base(deserializing) { }78 pr ivateDataTable(DataTable original, Cloner cloner)73 protected DataTable(bool deserializing) : base(deserializing) { } 74 protected DataTable(DataTable original, Cloner cloner) 79 75 : base(original, cloner) { 80 76 this.VisualProperties = (DataTableVisualProperties)cloner.Clone(original.visualProperties); … … 114 110 115 111 public event EventHandler VisualPropertiesChanged; 116 pr ivatevoid OnVisualPropertiesChanged() {112 protected virtual void OnVisualPropertiesChanged() { 117 113 EventHandler handler = VisualPropertiesChanged; 118 114 if (handler != null) handler(this, EventArgs.Empty); … … 123 119 } 124 120 125 pr ivatevoid RegisterRowsEvents() {121 protected virtual void RegisterRowsEvents() { 126 122 rows.ItemsAdded += new CollectionItemsChangedEventHandler<DataRow>(rows_ItemsAdded); 127 123 rows.ItemsRemoved += new CollectionItemsChangedEventHandler<DataRow>(rows_ItemsRemoved); … … 158 154 } 159 155 160 pr ivatevoid RegisterRowEvents(DataRow row) {156 protected virtual void RegisterRowEvents(DataRow row) { 161 157 row.Values.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_ItemsAdded); 162 158 row.Values.ItemsMoved += new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_ItemsMoved); … … 165 161 row.Values.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_CollectionReset); 166 162 } 167 pr ivatevoid DeregisterRowEvents(DataRow row) {163 protected virtual void DeregisterRowEvents(DataRow row) { 168 164 row.Values.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_ItemsAdded); 169 165 row.Values.ItemsMoved -= new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_ItemsMoved); … … 233 229 234 230 public event EventHandler<EventArgs<int, int>> ItemChanged; 235 pr ivatevoid OnItemChanged(int rowIndex, int columnIndex) {231 protected virtual void OnItemChanged(int rowIndex, int columnIndex) { 236 232 var handler = ItemChanged; 237 233 if (handler != null) handler(this, new EventArgs<int, int>(rowIndex, columnIndex)); … … 239 235 } 240 236 public event EventHandler Reset; 241 pr ivatevoid OnReset() {237 protected virtual void OnReset() { 242 238 var handler = Reset; 243 239 if (handler != null) handler(this, EventArgs.Empty); 244 240 } 245 241 public event EventHandler ColumnNamesChanged; 246 pr ivatevoid OnColumnNamesChanged() {242 protected virtual void OnColumnNamesChanged() { 247 243 var handler = ColumnNamesChanged; 248 244 if (handler != null) handler(this, EventArgs.Empty); 249 245 } 250 246 public event EventHandler RowNamesChanged; 251 pr ivatevoid OnRowNamesChanged() {247 protected virtual void OnRowNamesChanged() { 252 248 var handler = RowNamesChanged; 253 249 if (handler != null) handler(this, EventArgs.Empty); 254 250 } 255 251 public event EventHandler SortableViewChanged; 256 pr ivatevoid OnSortableViewChanged() {252 protected virtual void OnSortableViewChanged() { 257 253 var handler = SortableViewChanged; 258 254 if (handler != null) handler(this, EventArgs.Empty);
Note: See TracChangeset
for help on using the changeset viewer.