Changeset 11379

Timestamp:

09/17/14 20:54:20 (10 years ago)

Author:

ascheibe

Message:

#2031 fixed some bugs

Location:

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3

Files:

• ChartAnalysisView.cs (modified) (8 diffs)
• CorrelationView.cs (modified) (1 diff)

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

@@ -86 +86 @@
 
     private void UpdateComboboxes() {
-      dataTableComboBox.Items.Clear();
-      dataRowComboBox.Items.Clear();
-
       if (Content != null) {
         UpdateDataTableComboBox();
@@ -200 +197 @@
       MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Adding fitted lines to charts...");
 
-      var task = Task.Factory.StartNew(AddLineToChart);
+      string resultName = (string)dataTableComboBox.SelectedItem;
+      string rowName = (string)dataRowComboBox.SelectedItem;
+
+      var task = Task.Factory.StartNew(() => AddLineToChart(resultName, rowName));
 
       task.ContinueWith((t) => {
@@ -212 +212 @@
     }
 
-    private void AddLineToChart() {
-      string resultName = (string)dataTableComboBox.SelectedItem;
-      string rowName = (string)dataRowComboBox.SelectedItem;
-
+    private void AddLineToChart(string resultName, string rowName) {
       foreach (IRun run in runs) {
         DataTable resTable = (DataTable)run.Results[resultName];
@@ -253 +250 @@
 
     private void UpdateDataRowComboBox() {
+      string selectedItem = (string)this.dataRowComboBox.SelectedItem;
+
       dataRowComboBox.Items.Clear();
       var resultName = (string)dataTableComboBox.SelectedItem;
@@ -263 +262 @@
 
       dataRowComboBox.Items.AddRange(rowNames);
-      if (dataRowComboBox.Items.Count > 0) dataRowComboBox.SelectedItem = dataRowComboBox.Items[0];
+      if (selectedItem != null && dataRowComboBox.Items.Contains(selectedItem)) {
+        dataRowComboBox.SelectedItem = selectedItem;
+      } else if (dataRowComboBox.Items.Count > 0) {
+        dataRowComboBox.SelectedItem = dataRowComboBox.Items[0];
+      }
     }
 
     private void UpdateDataTableComboBox() {
+      string selectedItem = (string)this.dataTableComboBox.SelectedItem;
+
       dataTableComboBox.Items.Clear();
       var dataTables = (from run in Content
@@ -274 +279 @@
 
       dataTableComboBox.Items.AddRange(dataTables);
-      if (dataTableComboBox.Items.Count > 0) dataTableComboBox.SelectedItem = dataTableComboBox.Items[0];
+      if (selectedItem != null && dataTableComboBox.Items.Contains(selectedItem)) {
+        dataTableComboBox.SelectedItem = selectedItem;
+      } else if (dataTableComboBox.Items.Count > 0) {
+        dataTableComboBox.SelectedItem = dataTableComboBox.Items[0];
+      }
     }
 
@@ -280 +289 @@
       progress = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Calculating values...");
 
-      var task = Task.Factory.StartNew(RebuildDataTable);
+      string resultName = (string)dataTableComboBox.SelectedItem;
+      string rowName = (string)dataRowComboBox.SelectedItem;
+
+      var task = Task.Factory.StartNew(() => RebuildDataTable(resultName, rowName));
 
       task.ContinueWith((t) => {
@@ -292 +304 @@
     }
 
-    private void RebuildDataTable() {
-      string resultName = (string)dataTableComboBox.SelectedItem;
-      string rowName = (string)dataRowComboBox.SelectedItem;
+    private void RebuildDataTable(string resultName, string rowName) {
       LinearLeastSquaresFitting llsFitting = new LinearLeastSquaresFitting();
       LogFitting logFitting = new LogFitting();

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

@@ -140 +140 @@
 
     private void Content_CollectionReset(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
+      DeregisterRunEvents(e.OldItems);
+      RegisterRunEvents(e.Items);
       UpdateUI();
     }
 
     private void Content_ItemsRemoved(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
+      DeregisterRunEvents(e.Items);
       UpdateUI();
     }
 
     private void Content_ItemsAdded(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
+      RegisterRunEvents(e.Items);
       UpdateUI();
     }