Changeset 3557 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

04/29/10 15:10:17 (14 years ago)

Author:

mkommend

Message:

changed logic of showing new views (ticket #972)

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• EngineAlgorithmView.cs (modified) (1 diff)
• RunCollectionBubbleChartView.cs (modified) (1 diff)
• RunCollectionTabularView.cs (modified) (1 diff)
• RunCollectionView.cs (modified) (2 diffs)
• RunView.cs (modified) (3 diffs)

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

@@ -153 +153 @@
 
     protected virtual void createUserDefinedAlgorithmButton_Click(object sender, EventArgs e) {
-      IContentView view = MainFormManager.CreateDefaultView(Content.CreateUserDefinedAlgorithm());
+      IContentView view = MainFormManager.MainForm.ShowContent(Content.CreateUserDefinedAlgorithm());
       if (view != null) {
         view.ReadOnly = this.ReadOnly;
         view.Locked = this.Locked;
-        view.Show();
       }
     }

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

@@ -289 +289 @@
         IRun run = (IRun)((DataPoint)h.Object).Tag;
         if (e.Clicks >= 2) {
-          IContentView view = MainFormManager.CreateDefaultView(run);
-          view.ReadOnly = this.ReadOnly;
-          view.Locked = this.Locked;
-          view.Show();
+          IContentView view = MainFormManager.MainForm.ShowContent(run);
+          if (view != null) {
+            view.ReadOnly = this.ReadOnly;
+            view.Locked = this.Locked;
+          }
         } else
           this.draggedRun = run;

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

@@ -102 +102 @@
       if (e.RowIndex >= 0) {
         IRun run = Content.ElementAt(virtualRowIndizes[e.RowIndex]);
-        IContentView view = MainFormManager.CreateDefaultView(run);
+        IContentView view = MainFormManager.MainForm.ShowContent(run);
         if (view != null) {
           view.ReadOnly = this.ReadOnly;
           view.Locked = this.Locked;
-          view.Show();
         }
       }

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

@@ -195 +195 @@
       if (itemsListView.SelectedItems.Count == 1) {
         IRun item = (IRun)itemsListView.SelectedItems[0].Tag;
-        IContentView view = MainFormManager.CreateDefaultView(item);
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = ReadOnly;
           view.Locked = Locked;
-          view.Show();
         }
       }
@@ -242 +241 @@
     protected virtual void menuItem_Click(object sender, EventArgs e) {
       ToolStripMenuItem menuItem = (ToolStripMenuItem)sender;
-      IContentView view = MainFormManager.CreateView((Type)menuItem.Tag, Content);
+      IContentView view = MainFormManager.CreateView((Type)menuItem.Tag);
       if (view != null) {
         view.Locked = Locked;
         view.ReadOnly = ReadOnly;
         view.Show();
+        view.Content = Content;
       }
     }

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

@@ -119 +119 @@
       if (listView.SelectedItems.Count == 1) {
         viewHost.ViewType = null;
-        viewHost.Content = (IContent) listView.SelectedItems[0].Tag;
+        viewHost.Content = (IContent)listView.SelectedItems[0].Tag;
       } else {
         viewHost.Content = null;
@@ -127 +127 @@
       if (listView.SelectedItems.Count == 1) {
         IItem item = (IItem)listView.SelectedItems[0].Tag;
-        IContentView view = MainFormManager.CreateDefaultView(item);
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = ReadOnly;
           view.Locked = Locked;
-          view.Show();
         }
       }
@@ -147 +146 @@
     private void showAlgorithmButton_Click(object sender, EventArgs e) {
       if (!Locked) {
-        IContentView view = MainFormManager.CreateDefaultView(Content.Algorithm.Clone());
-        if (view != null) {
-          view.Show();
-        }
+        MainFormManager.MainForm.ShowContent((IContent)Content.Algorithm.Clone());
       }
     }