Changeset 17304 for branches/2971_named_intervals
- Timestamp:
- 10/03/19 12:59:43 (5 years ago)
- Location:
- branches/2971_named_intervals
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis merged: 17301
- Property svn:mergeinfo changed
-
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis.Views merged: 17276
- Property svn:mergeinfo changed
-
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.Designer.cs
r17208 r17304 192 192 this.Name = "ClassificationSolutionVariableImpactsView"; 193 193 this.Size = new System.Drawing.Size(712, 365); 194 this.VisibleChanged += new System.EventHandler(this.ClassificationSolutionVariableImpactsView_VisibleChanged);195 194 this.ResumeLayout(false); 196 195 this.PerformLayout(); -
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.cs
r17208 r17304 40 40 private CancellationTokenSource cancellationToken = new CancellationTokenSource(); 41 41 private List<Tuple<string, double>> rawVariableImpacts = new List<Tuple<string, double>>(); 42 private bool attachedToProgress = false; 42 43 43 44 public new IClassificationSolution Content { … … 86 87 } 87 88 } 88 private void ClassificationSolutionVariableImpactsView_VisibleChanged(object sender, EventArgs e) { 89 protected override void OnHidden(EventArgs e) { 90 base.OnHidden(e); 89 91 cancellationToken.Cancel(); 92 93 if (attachedToProgress) { 94 Progress.Hide(this); 95 attachedToProgress = false; 96 } 90 97 } 91 98 … … 126 133 variableImpactsArrayView.Caption = Content.Name + " Variable Impacts"; 127 134 progress = Progress.Show(this, "Calculating variable impacts for " + Content.Name); 135 attachedToProgress = true; 128 136 cancellationToken = new CancellationTokenSource(); 129 137 … … 144 152 UpdateOrdering(); 145 153 } finally { 146 Progress.Hide(this); 154 if (attachedToProgress) { 155 Progress.Hide(this); 156 attachedToProgress = false; 157 } 147 158 } 148 159 } -
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.Designer.cs
r17208 r17304 192 192 this.Name = "RegressionSolutionVariableImpactsView"; 193 193 this.Size = new System.Drawing.Size(712, 365); 194 this.VisibleChanged += new System.EventHandler(this.RegressionSolutionVariableImpactsView_VisibleChanged);195 194 this.ResumeLayout(false); 196 195 this.PerformLayout(); -
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs
r17208 r17304 40 40 private CancellationTokenSource cancellationToken = new CancellationTokenSource(); 41 41 private List<Tuple<string, double>> rawVariableImpacts = new List<Tuple<string, double>>(); 42 private bool attachedToProgress = false; 42 43 43 44 public new IRegressionSolution Content { … … 86 87 } 87 88 } 88 private void RegressionSolutionVariableImpactsView_VisibleChanged(object sender, EventArgs e) { 89 90 protected override void OnHidden(EventArgs e) { 91 base.OnHidden(e); 89 92 cancellationToken.Cancel(); 93 94 if (attachedToProgress) { 95 Progress.Hide(this); 96 attachedToProgress = false; 97 } 90 98 } 91 99 … … 124 132 variableImpactsArrayView.Caption = Content.Name + " Variable Impacts"; 125 133 var progress = Progress.Show(this, "Calculating variable impacts for " + Content.Name); 134 attachedToProgress = true; 126 135 cancellationToken = new CancellationTokenSource(); 127 136 … … 141 150 rawVariableImpacts.AddRange(impacts); 142 151 UpdateOrdering(); 143 } 144 finally { 145 Progress.Hide(this); 152 } finally { 153 if (attachedToProgress) { 154 Progress.Hide(this); 155 attachedToProgress = false; 156 } 146 157 } 147 158 } -
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis/3.4 merged: 17301
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.