Changeset 7399 for branches/ChangeDatasetOfRegressionModel

Timestamp:

01/23/12 17:14:54 (13 years ago)

Author:

sforsten

Message:

#1758:

• implemented SetEnabledStateOfControls in RegressionSolutionView
• fixed bug in NamedDataAnalysisSolutionView (If OnContentChanged creates a new DataAnalysisSolutionView, it sets Locked and ReadOnly as it is set in the current view.)

Location:

branches/ChangeDatasetOfRegressionModel

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/NamedDataAnalysisSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs (modified) (2 diffs)

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.resx

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.resx

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs

@@ -36 +36 @@
       // 
       // 
-      // splitContainer.Panel2
+      // splitContainer.Panel1
       // 
-      this.splitContainer.Panel2.Controls.Add(this.btnSimplify);
+      this.splitContainer.Panel1.Controls.Add(this.btnSimplify);
       this.splitContainer.Size = new System.Drawing.Size(480, 275);
       this.splitContainer.SplitterDistance = 255;
@@ -68 +68 @@
       // btnSimplify
       // 
-      this.btnSimplify.Location = new System.Drawing.Point(3, 4);
+      this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.btnSimplify.Location = new System.Drawing.Point(177, 4);
       this.btnSimplify.Name = "btnSimplify";
       this.btnSimplify.Size = new System.Drawing.Size(75, 23);

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

@@ -56 +56 @@
         if (viewType != null) {
           view = (DataAnalysisSolutionView)Activator.CreateInstance(viewType);
+          view.Locked = this.Locked;
+          view.ReadOnly = this.ReadOnly;
           view.Dock = DockStyle.Fill;
           view.Content = Content;

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

@@ -58 +58 @@
       // 
       // 
-      // splitContainer.Panel1
+      // splitContainer.Panel2
       // 
-      this.splitContainer.Panel1.Controls.Add(this.btnImport);
+      this.splitContainer.Panel2.Controls.Add(this.btnImport);
       // 
       // itemsGroupBox
@@ -76 +76 @@
       // btnImport
       // 
-      this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.btnImport.Location = new System.Drawing.Point(172, 4);
+      this.btnImport.Location = new System.Drawing.Point(3, 4);
       this.btnImport.Name = "btnImport";
       this.btnImport.Size = new System.Drawing.Size(75, 23);

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

@@ -43 +43 @@
     }
 
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      btnImport.Enabled = !Locked && !ReadOnly && Content != null;
+    }
+
     #region drag and drop
     protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
@@ -67 +72 @@
         }
 
-        IRegressionProblemData problemData = null;
-        if (hlFile != null && hlFile is RegressionProblemData) {
-          problemData = (RegressionProblemData)hlFile;
-        } else if (hlFile != null && hlFile is IRegressionProblem) {
-          problemData = ((IRegressionProblem)hlFile).ProblemData;
-        }
-        if (problemData != null) {
-          StringBuilder message = new StringBuilder();
-          if (!problemData.TargetVariable.Equals(Content.ProblemData.TargetVariable))
-            message.AppendLine("The target variables are not matching. Old target variable: '" + Content.ProblemData.TargetVariable
-              + "'. New targetvariable: '" + problemData.TargetVariable + "'");
-
-          List<string> variables = problemData.InputVariables.Select(x => x.Value).ToList();
-
-          foreach (var item in Content.ProblemData.InputVariables.CheckedItems) {
-            if (!variables.Contains(item.Value.Value))
-              message.AppendLine("Input variable '" + item.Value.Value + "' is not in the new problem data.");
+        if (hlFile != null) {
+          IRegressionProblemData problemData = null;
+          if (hlFile is RegressionProblemData) {
+            problemData = (RegressionProblemData)hlFile;
+          } else if (hlFile is IRegressionProblem) {
+            problemData = ((IRegressionProblem)hlFile).ProblemData;
+          } else if (hlFile is IRegressionSolution) {
+            problemData = ((IRegressionSolution)hlFile).ProblemData;
           }
 
-          if (message.Length != 0)
-            ErrorHandling.ShowErrorDialog(this, new Exception(message.ToString()));
-          else
-            Content.ProblemData = problemData;
+          if (problemData == null) {
+            ErrorHandling.ShowErrorDialog(this,
+              new NullReferenceException("The problem data is null." + Environment.NewLine
+                                       + "The .hl-file is no RegressionProblemData or RegressionProblem."));
+          } else {
+            StringBuilder message = new StringBuilder();
+            if (!problemData.TargetVariable.Equals(Content.ProblemData.TargetVariable))
+              message.AppendLine("The target variables are not matching. Old target variable: '"
+                               + Content.ProblemData.TargetVariable
+                               + "'. New targetvariable: '" + problemData.TargetVariable + "'");
+
+            List<string> variables = problemData.InputVariables.Select(x => x.Value).ToList();
+
+            foreach (var item in Content.ProblemData.InputVariables.CheckedItems) {
+              if (!variables.Contains(item.Value.Value))
+                message.AppendLine("Input variable '" + item.Value.Value + "' is not in the new problem data.");
+            }
+
+            if (message.Length != 0)
+              ErrorHandling.ShowErrorDialog(this, new Exception(message.ToString()));
+            else
+              Content.ProblemData = problemData;
+          }
         }
       }

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
+*.resx