Changeset 3709 for trunk

Timestamp:

05/07/10 18:12:52 (15 years ago)

Author:

mkommend

Message:

corrected collection views and ViewHost (ticket #972)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -204 +204 @@
         T item = itemsListView.SelectedItems[0].Tag as T;
         detailsGroupBox.Enabled = true;
-        viewHost.ViewType = null;
         viewHost.Content = item;
       } else {

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -167 +167 @@
         T item = (T)itemsListView.SelectedItems[0].Tag;
         detailsGroupBox.Enabled = true;
-        viewHost.ViewType = null;
         viewHost.Content = item;
       } else {

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -199 +199 @@
         T item = (T)itemsListView.SelectedItems[0].Tag;
         detailsGroupBox.Enabled = true;
-        viewHost.ViewType = null;
         viewHost.Content = item;
       } else {

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -83 +83 @@
       }
     }
-    public new IContent Content {
-      get { return base.Content; }
-      set {
-        if (value == null || this.Content == null || value.GetType() != this.Content.GetType())
-          cachedViews.Clear();
-
-        base.Content = value;
-      }
-    }
 
     public new bool Enabled {
@@ -118 +109 @@
 
         if (!ViewCanShowContent(viewType, Content)) {
+          cachedViews.Clear();
           ViewType = MainFormManager.GetDefaultViewType(Content.GetType());
           if ((viewType == null) && (viewContextMenuStrip.Items.Count > 0))  // create first available view if default view is not available
@@ -129 +121 @@
         viewsLabel.Visible = false;
         viewPanel.Visible = false;
-        if (viewPanel.Controls.Count > 0) viewPanel.Controls[0].Dispose();
-        viewPanel.Controls.Clear();
-        cachedViews.Clear();
       }
     }

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

@@ -75 +75 @@
       } else {
         repetitionsNumericUpDown.Value = Content.Repetitions;
-        algorithmViewHost.ViewType = null;
         algorithmViewHost.Content = Content.Algorithm;
         runsView.Content = Content.Runs;
@@ -127 +126 @@
         Invoke(new EventHandler(Content_AlgorithmChanged), sender, e);
       else {
-        algorithmViewHost.ViewType = null;
         algorithmViewHost.Content = Content.Algorithm;
       }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -98 +98 @@
       while (itemsListView.Items.Count > 0) RemoveListViewItem(itemsListView.Items[0]);
       viewHost.Content = null;
-      runCollectionConstraintCollectionView.Content = null;
-      tabControl.TabPages.Remove(constraintPage);
 
       if (Content != null) {
         if (RunCollection != null) {
-          tabControl.TabPages.Add(constraintPage);
+          if (!tabControl.TabPages.Contains(constraintPage))
+            tabControl.TabPages.Add(constraintPage);
           runCollectionConstraintCollectionView.Content = RunCollection.Constraints;
           runCollectionConstraintCollectionView.ReadOnly = itemsListView.Items.Count == 0;
@@ -112 +111 @@
           UpdateRun(item);
         }
+      } else {
+        runCollectionConstraintCollectionView.Content = null;
+        if (tabControl.TabPages.Contains(constraintPage))
+          tabControl.TabPages.Remove(constraintPage);
       }
       SetEnabledStateOfControls();
@@ -183 +186 @@
         IRun item = (IRun)itemsListView.SelectedItems[0].Tag;
         detailsGroupBox.Enabled = true;
-        viewHost.ViewType = null;
         viewHost.Content = item;
       } else {