Changeset 3894 for trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.cs

Timestamp:

06/02/10 21:34:31 (14 years ago)

Author:

abeham

Message:

#1029

• Added Bounds to SingleObjectiveTestFunctionSolution
• This would break persistence, so I added a CompatibilityMethod (which can be removed again once moving to 3.4)

File:

• trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.cs

@@ -55 +55 @@
       Content.QualityChanged -= new EventHandler(Content_QualityChanged);
       Content.PopulationChanged -= new EventHandler(Content_PopulationChanged);
+      Content.BoundsChanged -= new EventHandler(Content_BoundsChanged);
       base.DeregisterContentEvents();
     }
@@ -63 +64 @@
       Content.QualityChanged += new EventHandler(Content_QualityChanged);
       Content.PopulationChanged += new EventHandler(Content_PopulationChanged);
+      Content.BoundsChanged += new EventHandler(Content_BoundsChanged);
     }
 
@@ -99 +101 @@
         GenerateImage();
       }
+    }
+
+    private void Content_BoundsChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_BoundsChanged), sender, e);
+      else
+        GenerateImage();
     }
 
@@ -139 +148 @@
           }
           pictureBox.Refresh();
-          DoubleMatrix bounds = Content.Evaluator.Bounds;
+          DoubleMatrix bounds = Content.Bounds;
+          if (bounds == null) bounds = Content.Evaluator.Bounds;
           double xMin = bounds[0, 0], xMax = bounds[0, 1], yMin = bounds[1 % bounds.Rows, 0], yMax = bounds[1 % bounds.Rows, 1];
           double xStep = backgroundImage.Width / (xMax - xMin), yStep = backgroundImage.Height / (yMax - yMin);
@@ -164 +174 @@
         backgroundImage.Dispose();
       backgroundImage = new Bitmap(pictureBox.Width, pictureBox.Height);
-      DoubleMatrix bounds = Content.Evaluator.Bounds;
+      DoubleMatrix bounds = Content.Bounds;
+      if (bounds == null) bounds = Content.Evaluator.Bounds;
       double xMin = bounds[0, 0], xMax = bounds[0, 1], yMin = bounds[1 % bounds.Rows, 0], yMax = bounds[1 % bounds.Rows, 1];
       double xStep = (xMax - xMin) / backgroundImage.Width, yStep = (yMax - yMin) / backgroundImage.Height;