Changeset 16519 for trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs
- Timestamp:
- 01/08/19 15:29:57 (5 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2972_PDPRowSelect (added) merged: 16444-16445,16516-16518
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/branches/2972_PDPRowSelect/HeuristicLab.Problems.DataAnalysis.Views (added) merged: 16445,16516-16517
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs
r15845 r16519 245 245 // add an event such that whenever a value is changed in the shared dataset, 246 246 // this change is reflected in the internal dataset (where the value becomes a whole column) 247 if (this.sharedFixedVariables != null) 247 if (this.sharedFixedVariables != null) { 248 248 this.sharedFixedVariables.ItemChanged -= sharedFixedVariables_ItemChanged; 249 this.sharedFixedVariables.Reset -= sharedFixedVariables_Reset; 250 } 251 249 252 this.sharedFixedVariables = sharedFixedVariables; 250 253 this.sharedFixedVariables.ItemChanged += sharedFixedVariables_ItemChanged; 254 this.sharedFixedVariables.Reset += sharedFixedVariables_Reset; 251 255 252 256 RecalculateTrainingLimits(initializeAxisRanges); … … 314 318 if (updateOnFinish) 315 319 Update(); 316 } 317 catch (OperationCanceledException) { } 318 catch (AggregateException ae) { 320 } catch (OperationCanceledException) { 321 } catch (AggregateException ae) { 319 322 if (!ae.InnerExceptions.Any(e => e is OperationCanceledException)) 320 323 throw; … … 626 629 var variableName = variables[columnIndex]; 627 630 if (variableName == FreeVariable) return; 631 628 632 if (internalDataset.VariableHasType<double>(variableName)) { 629 633 var v = sharedFixedVariables.GetDoubleValue(variableName, rowIndex); … … 640 644 } 641 645 646 private void sharedFixedVariables_Reset(object sender, EventArgs e) { 647 var newValue = sharedFixedVariables.GetDoubleValue(FreeVariable, 0); 648 VerticalLineAnnotation.X = newValue; 649 UpdateCursor(); // triggers update of InternalDataset 650 } 651 642 652 private void chart_AnnotationPositionChanging(object sender, AnnotationPositionChangingEventArgs e) { 643 653 var step = (trainingMax - trainingMin) / drawingSteps; … … 658 668 private void UpdateCursor() { 659 669 var x = VerticalLineAnnotation.X; 660 sharedFixedVariables.SetVariableValue(x, FreeVariable, 0); 670 671 if (!sharedFixedVariables.GetDoubleValue(FreeVariable, 0).IsAlmost(x)) 672 sharedFixedVariables.SetVariableValue(x, FreeVariable, 0); 661 673 662 674 if (ShowCursor) {
Note: See TracChangeset
for help on using the changeset viewer.