Changeset 12631 for trunk/sources/HeuristicLab.Analysis.Statistics.Views

Timestamp:

07/07/15 11:05:07 (9 years ago)

Author:

ascheibe

Message:

#2270 added refresh of data table combobox for the chart analysis and aggregation view

File:

• trunk/sources/HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -52 +53 @@
     private bool valuesAdded = false;
     private bool suppressUpdates = false;
+    private SemaphoreSlim sem = new SemaphoreSlim(1, 1);
 
     public ChartAnalysisView() {
@@ -119 +121 @@
       if (InvokeRequired) Invoke((Action<object, EventArgs>)Content_ColumnsChanged, sender, e);
       else {
+        UpdateDataTableComboBox();
         RebuildDataTableAsync();
       }
@@ -138 +141 @@
 
         if (!suppressUpdates && !valuesAdded) {
+          UpdateDataTableComboBox();
           RebuildDataTableAsync();
         }
@@ -164 +168 @@
 
     private void dataRowComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      if (suppressUpdates) return;
       RebuildDataTableAsync();
     }
@@ -266 +271 @@
       string rowName = (string)dataRowComboBox.SelectedItem;
 
-      progress = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Calculating values...");
-      var task = Task.Factory.StartNew(() => RebuildDataTable(resultName, rowName));
+      var task = Task.Factory.StartNew(() => {
+        sem.Wait();
+        progress = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Calculating values...");
+        RebuildDataTable(resultName, rowName);
+      });
 
       task.ContinueWith((t) => {
         MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
         ErrorHandling.ShowErrorDialog("An error occured while calculating values. ", t.Exception);
+        sem.Release();
       }, TaskContinuationOptions.OnlyOnFaulted);
 
       task.ContinueWith((t) => {
         MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
+        sem.Release();
       }, TaskContinuationOptions.OnlyOnRanToCompletion);
     }