Changeset 6729 for trunk/sources

Timestamp:

09/09/11 12:12:42 (13 years ago)

Author:

gkronber

Message:

#1594 #1637 added view caching to NamedDataAnalysisSolutionView

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/NamedDataAnalysisSolutionView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views {
-  [Content(typeof(SymbolicDiscriminantFunctionClassificationSolution), true)]
+  [Content(typeof(SymbolicDiscriminantFunctionClassificationSolution), false)]
   [View("SymbolicDiscriminantFunctionClassificationSolution View")]
   public partial class SymbolicDiscriminantFunctionClassificationSolutionView : DiscriminantFunctionClassificationSolutionView {

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs

@@ -32 +32 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Classification Threshold")]
-  [Content(typeof(IDiscriminantFunctionClassificationSolution), true)]
+  [Content(typeof(IDiscriminantFunctionClassificationSolution), false)]
   public sealed partial class DiscriminantFunctionClassificationSolutionThresholdView : DataAnalysisSolutionEvaluationView {
     private const double TrainingAxisValue = 0.0;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/NamedDataAnalysisSolutionView.cs

@@ -30 +30 @@
   [Content(typeof(DataAnalysisSolution), true)]
   public partial class NamedDataAnalysisSolutionView : NamedItemView {
+    private Type contentType;
+    private DataAnalysisSolutionView view;
+
     public NamedDataAnalysisSolutionView() {
       InitializeComponent();
@@ -41 +44 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      panel.Controls.Clear();
 
-      if (Content != null) {
+      if (Content == null) {
+        panel.Controls.Clear();
+      } else if (Content.GetType() == contentType && view != null) {
+        view.Content = Content;
+      } else {
+        view = null;
+        contentType = Content.GetType();
+        panel.Controls.Clear();
         var viewType = MainFormManager.GetViewTypes(Content.GetType(), true).Where(t => typeof(DataAnalysisSolutionView).IsAssignableFrom(t)).FirstOrDefault();
         if (viewType != null) {
-          var view = (DataAnalysisSolutionView)Activator.CreateInstance(viewType);
+          view = (DataAnalysisSolutionView)Activator.CreateInstance(viewType);
           view.Dock = DockStyle.Fill;
           view.Content = Content;