Changeset 13837 for branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionGradientView.cs

Timestamp:

05/09/16 12:28:09 (8 years ago)

Author:

pfleck

Message:

#2597:

• Reverted UpdateAutomatically property.
• Made UpdateChart method async to avoid blocking the GUI thread.
• Changed Content type of RegressionSolutionGradientView to IRegressionSolution.

File:

• branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionGradientView.cs (modified) (6 diffs)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionGradientView.cs

@@ -32 +32 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
   [View("Gradient View")]
-  [Content(typeof(IConfidenceBoundRegressionSolution))]
+  [Content(typeof(IRegressionSolution))]
   public partial class RegressionSolutionGradientView : DataAnalysisSolutionEvaluationView {
     private const int DrawingSteps = 1000;
@@ -44 +44 @@
     }
 
-    public new IConfidenceBoundRegressionSolution Content {
-      get { return (IConfidenceBoundRegressionSolution)base.Content; }
+    public new IRegressionSolution Content {
+      get { return (IRegressionSolution)base.Content; }
       set { base.Content = value; }
     }
@@ -55 +55 @@
       trackbars = new ObservableList<DensityTrackbar>();
       trackbars.ItemsAdded += (sender, args) => {
-        ForEach(args.Items.Select(i => i.Value), RegisterEvents);
+        args.Items.Select(i => i.Value).ForEach(RegisterEvents);
       };
       trackbars.ItemsRemoved += (sender, args) => {
-        ForEach(args.Items.Select(i => i.Value), DeregisterEvents);
+        args.Items.Select(i => i.Value).ForEach(DeregisterEvents);
       };
       trackbars.CollectionReset += (sender, args) => {
-        ForEach(args.OldItems.Select(i => i.Value), DeregisterEvents);
-        ForEach(args.Items.Select(i => i.Value), RegisterEvents);
+        args.OldItems.Select(i => i.Value).ForEach(DeregisterEvents);
+        args.Items.Select(i => i.Value).ForEach(RegisterEvents);
       };
 
@@ -87 +87 @@
       sharedFixedVariables = new ModifiableDataset(variableNames, newTrackbars.Select(tb => new List<double>(1) { (double)tb.Value }));
       gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableNames.First(), DrawingSteps);
-      gradientChart.UpdateChart();
+      gradientChart.UpdateChartAsync();
 
       // Add to table and observable lists     
@@ -149 +149 @@
     }
 
-    private void trackbar_ValueChanged(object sender, EventArgs e) {
+    private async void trackbar_ValueChanged(object sender, EventArgs e) {
       var trackBar = sender as DensityTrackbar;
       if (trackBar == null) return;
       sharedFixedVariables.SetVariableValue((double)trackBar.Value, variableNames[trackbars.IndexOf(trackBar)], 0);
-      gradientChart.UpdateChart();
+      await gradientChart.UpdateChartAsync();
     }
 
@@ -183 +183 @@
     #endregion
 
-    public static void ForEach<T>(IEnumerable<T> source, Action<T> action) {
+
+  }
+
+  internal static class Extensions {
+    public static void ForEach<T>(this IEnumerable<T> source, Action<T> action) {
       foreach (T item in source)
         action(item);