Changeset 9923 for branches/StatisticalTesting

Timestamp:

09/02/13 14:03:42 (11 years ago)

Author:

ascheibe

Message:

#2031 fixed cross threading errors

File:

• branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs (modified) (4 diffs)

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs

@@ -241 +241 @@
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>()
           .AddOperationProgressToView(this, "Calculating...");
-        Task.Factory.StartNew(CalculateValuesAsync);
-      }
-    }
-
-    private void CalculateValuesAsync() {
+
+        string curItem = (string)groupCompComboBox.SelectedItem;
+        Task.Factory.StartNew(() => CalculateValuesAsync(curItem));
+      }
+    }
+
+    private void CalculateValuesAsync(string groupName) {
       TestAllGroups();
       CalculateNormality();
       CalculateNormalityDetails();
-      CalculatePairwiseTest();
-      CalculatePairwiseTestDetails();
+      CalculatePairwiseTest(groupName);
+      CalculatePairwiseTestDetails(groupName);
 
       MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
     }
 
-    private void CalculatePairwise() {
+    private void CalculatePairwise(string groupName) {
       MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Calculating...");
-      Task.Factory.StartNew(CalculatePairwiseAsync);
-    }
-
-    private void CalculatePairwiseAsync() {
-      CalculatePairwiseTest();
-      CalculatePairwiseTestDetails();
+      Task.Factory.StartNew(() => CalculatePairwiseAsync(groupName));
+    }
+
+    private void CalculatePairwiseAsync(string groupName) {
+      CalculatePairwiseTest(groupName);
+      CalculatePairwiseTestDetails(groupName);
 
       MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
@@ -309 +311 @@
     }
 
-    private void CalculatePairwiseTest() {
-      string curItem = (string)groupCompComboBox.SelectedItem;
+    private void CalculatePairwiseTest(string groupName) {
       int colIndex = 0;
-
-      foreach (string col in stringConvertibleMatrixView.Content.ColumnNames) {
-        if (col == curItem) {
+      IEnumerable<string> columnNames = null;
+      this.Invoke(new Action(() => { columnNames = stringConvertibleMatrixView.Content.ColumnNames; }));
+
+      foreach (string col in columnNames) {
+        if (col == groupName) {
           break;
         }
@@ -344 +347 @@
     }
 
-    private void CalculatePairwiseTestDetails() {
-      string curItem = (string)groupCompComboBox.SelectedItem;
+    private void CalculatePairwiseTestDetails(string groupName) {
       int colIndex = 0;
-
-      foreach (string col in stringConvertibleMatrixView.Content.ColumnNames) {
-        if (col == curItem) {
+      IEnumerable<string> columnNames = null;
+      this.Invoke(new Action(() => { columnNames = stringConvertibleMatrixView.Content.ColumnNames; }));
+
+      foreach (string col in columnNames) {
+        if (col == groupName) {
           break;
         }
@@ -386 +390 @@
 
     private void groupCompComboBox_SelectedValueChanged(object sender, EventArgs e) {
-      CalculatePairwise();
+      string curItem = (string)groupCompComboBox.SelectedItem;
+      CalculatePairwise(curItem);
     }
   }