- Timestamp:
- 07/11/15 13:37:32 (9 years ago)
- Location:
- stable
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 12077,12112,12116-12117,12131,12173,12458,12599,12613,12631,12672,12684,12690,12692
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Analysis.Statistics.Views/3.3/CorrelationView.cs
r12199 r12725 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HeuristicLab.Collections; 25 26 using HeuristicLab.Core.Views; 26 27 using HeuristicLab.Data; … … 81 82 Content.ColumnsChanged += Content_ColumnsChanged; 82 83 Content.RowsChanged += Content_RowsChanged; 83 Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);84 Content.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 84 85 Content.UpdateOfRunsInProgressChanged += Content_UpdateOfRunsInProgressChanged; 85 86 } … … 89 90 Content.ColumnsChanged -= Content_ColumnsChanged; 90 91 Content.RowsChanged -= Content_RowsChanged; 91 Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);92 Content.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 92 93 Content.UpdateOfRunsInProgressChanged -= Content_UpdateOfRunsInProgressChanged; 93 94 } 94 95 95 96 void Content_RowsChanged(object sender, EventArgs e) { 96 UpdateUI(); 97 if (suppressUpdates) return; 98 if (InvokeRequired) Invoke((Action<object, EventArgs>)Content_RowsChanged, sender, e); 99 else { 100 UpdateUI(); 101 } 97 102 } 98 103 99 104 void Content_ColumnsChanged(object sender, EventArgs e) { 100 UpdateUI(); 101 } 102 103 private void Content_CollectionReset(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) { 104 UpdateUI(); 105 if (suppressUpdates) return; 106 if (InvokeRequired) Invoke((Action<object, EventArgs>)Content_ColumnsChanged, sender, e); 107 else { 108 UpdateUI(); 109 } 110 } 111 112 private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) { 113 if (suppressUpdates) return; 114 if (InvokeRequired) Invoke((Action<object, CollectionItemsChangedEventArgs<IRun>>)Content_CollectionReset, sender, e); 115 else { 116 UpdateUI(); 117 } 105 118 } 106 119 107 120 private void Content_UpdateOfRunsInProgressChanged(object sender, EventArgs e) { 108 suppressUpdates = Content.UpdateOfRunsInProgress; 109 UpdateUI(); 121 if (InvokeRequired) Invoke((Action<object, EventArgs>)Content_UpdateOfRunsInProgressChanged, sender, e); 122 else { 123 suppressUpdates = Content.UpdateOfRunsInProgress; 124 UpdateUI(); 125 } 110 126 } 111 127 #endregion 112 128 113 129 private void UpdateUI() { 114 if (!suppressUpdates) { 115 RebuildCorrelationTable(); 116 } 130 RebuildCorrelationTable(); 117 131 } 118 132
Note: See TracChangeset
for help on using the changeset viewer.