Changeset 7347

Timestamp:

01/17/12 16:18:18 (13 years ago)

Author:

sforsten

Message:

#1758:

• Bug fix in ItemCollectionView: Content events are deregistered in Dispose method
• Bug fix in ItemCollectionView: Item events are deregistered in OnContentChanged method
• small changes in RegressionSolutionView

Location:

branches/ChangeDatasetOfRegressionModel

Files:

• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs (modified) (3 diffs)

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -64 +64 @@
         if (components != null) components.Dispose();
       }
+      DeregisterContentEvents();
       base.Dispose(disposing);
     }
@@ -93 +94 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      foreach (T item in itemListViewItemMapping.Keys) {
+        DeregisterItemEvents(item);
+      }
       itemsListView.Items.Clear();
       itemListViewItemMapping.Clear();
@@ -190 +194 @@
       T item = listViewItem.Tag as T;
       int i = listViewItem.ImageIndex;
-      itemsListView.SmallImageList.Images[i] = item == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : item.ItemImage;
+      if (itemsListView.SmallImageList != null) {
+        itemsListView.SmallImageList.Images[i] = item == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : item.ItemImage;
+      } else {
+        listViewItem.ImageIndex = -1;
+      }
       listViewItem.ImageIndex = -1;
       listViewItem.ImageIndex = i;

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.Core;
@@ -64 +66 @@
           ErrorHandling.ShowErrorDialog(this, ex);
         }
+
         IRegressionProblemData problemData = null;
         if (hlFile != null && hlFile is RegressionProblemData) {
@@ -71 +74 @@
         }
         if (problemData != null) {
-          IList<string> missingVariables = new List<string>();
+          StringBuilder message = new StringBuilder();
           if (!problemData.TargetVariable.Equals(Content.ProblemData.TargetVariable))
-            missingVariables.Add(Content.ProblemData.TargetVariable);
+            message.AppendLine("The target variables are not matching. Old target variable: '" + Content.ProblemData.TargetVariable
+              + "'. New targetvariable: '" + problemData.TargetVariable + "'");
 
-          //foreach (var item in Content.ProblemData.InputVariables.CheckedItems) {
-          //  if (!problemData.InputVariables.Contains(item.Value))
-          //    missingVariables.Add(item.Value.ToString());
-          //}
+          List<string> variables = problemData.InputVariables.Select(x => x.Value).ToList();
 
-          //easier solution will be created later
-          bool found;
           foreach (var item in Content.ProblemData.InputVariables.CheckedItems) {
-            found = false;
-            foreach (var it in problemData.InputVariables) {
-              if (it.Value.Equals(item.Value.Value)) {
-                found = true;
-                break;
-              }
-            }
-            if (!found)
-              missingVariables.Add(item.Value.ToString());
+            if (!variables.Contains(item.Value.Value))
+              message.AppendLine("Input variable '" + item.Value.Value + "' is not in the new problem data.");
           }
 
-          if (missingVariables.Count != 0) {
-            string message = "";
-            foreach (var item in missingVariables) {
-              message += item + Environment.NewLine;
-            }
-            ErrorHandling.ShowErrorDialog(this, new Exception(message));
-          } else {
+          if (message.Length != 0)
+            ErrorHandling.ShowErrorDialog(this, new Exception(message.ToString()));
+          else
             Content.ProblemData = problemData;
-          }
         }
       }