Changeset 2546 for trunk/sources/HeuristicLab.Core.Views/3.3

Timestamp:

12/07/09 02:44:23 (14 years ago)

Author:

swagner

Message:

Continued work on Optimizer and on adapting all views to the new MainForm concept (#770)

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• EditorBase.Designer.cs (deleted)
• EditorBase.cs (deleted)
• EditorBase.resx (deleted)
• EngineBaseView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseEditor.Designer.cs) (1 diff)
• EngineBaseView.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseEditor.cs) (2 diffs)
• EngineBaseView.resx (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseEditor.resx)
• HeuristicLab.Core.Views-3.3.csproj (modified) (6 diffs)
• IEditor.cs (deleted)
• IItemView.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/IView.cs) (2 diffs)
• ItemBaseView.cs (modified) (1 diff)
• ItemViewBase.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ViewBase.Designer.cs) (1 diff)
• ItemViewBase.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ViewBase.cs) (3 diffs)
• OperatorBaseDescriptionView.cs (modified) (1 diff)
• OperatorBaseVariableInfosView.cs (modified) (1 diff)
• OperatorBaseVariablesView.cs (modified) (1 diff)
• OperatorBaseView.cs (modified) (1 diff)
• OperatorGraphView.cs (modified) (5 diffs)
• OperatorLibraryView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryEditor.Designer.cs) (1 diff)
• OperatorLibraryView.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryEditor.cs) (6 diffs)
• OperatorLibraryView.resx (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryEditor.resx)
• ScopeView.cs (modified) (3 diffs)
• VariableInfoView.cs (modified) (1 diff)
• VariableView.cs (modified) (1 diff)
• VariablesScopeView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/EngineBaseView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Core.Views {
-  partial class EngineBaseEditor {
+  partial class EngineBaseView {
     /// <summary> 
     /// Required designer variable.

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

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(EngineBase), true)]
-  public partial class EngineBaseEditor : EditorBase {
+  public partial class EngineBaseView : ItemViewBase {
     private int executionTimeCounter;
 
@@ -51 +51 @@
     /// Initializes a new instance of <see cref="EngineBaseEditor"/>.
     /// </summary>
-    public EngineBaseEditor() {
+    public EngineBaseView() {
       InitializeComponent();
     }

trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -70 +70 @@
       <DependentUpon>ChooseTypeDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="EditorBase.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="EditorBase.Designer.cs">
-      <DependentUpon>EditorBase.cs</DependentUpon>
-    </Compile>
-    <Compile Include="EngineBaseEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="EngineBaseEditor.Designer.cs">
-      <DependentUpon>EngineBaseEditor.cs</DependentUpon>
+    <Compile Include="EngineBaseView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EngineBaseView.Designer.cs">
+      <DependentUpon>EngineBaseView.cs</DependentUpon>
     </Compile>
     <Compile Include="HeuristicLabCoreViewsPlugin.cs" />
-    <Compile Include="IEditor.cs" />
+    <Compile Include="IItemView.cs" />
     <Compile Include="ItemBaseView.cs">
       <SubType>UserControl</SubType>
@@ -90 +84 @@
       <DependentUpon>ItemBaseView.cs</DependentUpon>
     </Compile>
-    <Compile Include="IView.cs" />
+    <Compile Include="ItemViewBase.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ItemViewBase.Designer.cs">
+      <DependentUpon>ItemViewBase.cs</DependentUpon>
+    </Compile>
     <Compile Include="OperatorBaseDescriptionView.cs">
       <SubType>UserControl</SubType>
@@ -121 +120 @@
       <DependentUpon>OperatorGraphView.cs</DependentUpon>
     </Compile>
-    <Compile Include="OperatorLibraryEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="OperatorLibraryEditor.Designer.cs">
-      <DependentUpon>OperatorLibraryEditor.cs</DependentUpon>
+    <Compile Include="OperatorLibraryView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OperatorLibraryView.Designer.cs">
+      <DependentUpon>OperatorLibraryView.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -151 +150 @@
     <Compile Include="VariableView.Designer.cs">
       <DependentUpon>VariableView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ViewBase.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ViewBase.Designer.cs">
-      <DependentUpon>ViewBase.cs</DependentUpon>
     </Compile>
   </ItemGroup>
@@ -205 +198 @@
       <DependentUpon>ChooseTypeDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="EditorBase.resx">
-      <DependentUpon>EditorBase.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EngineBaseEditor.resx">
-      <DependentUpon>EngineBaseEditor.cs</DependentUpon>
+    <EmbeddedResource Include="EngineBaseView.resx">
+      <DependentUpon>EngineBaseView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="ItemBaseView.resx">
@@ -229 +219 @@
       <DependentUpon>OperatorGraphView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperatorLibraryEditor.resx">
-      <DependentUpon>OperatorLibraryEditor.cs</DependentUpon>
+    <EmbeddedResource Include="OperatorLibraryView.resx">
+      <DependentUpon>OperatorLibraryView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="ScopeView.resx">

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

@@ -24 +24 @@
 using System.Text;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Core.Views {
@@ -29 +30 @@
   /// An interface for all kinds visual representations of items (objects, operators...).
   /// </summary>
-  public interface IView : IControl, HeuristicLab.MainForm.IView{
+  public interface IItemView : IView {
     /// <summary>
     /// Gets the current item instance.

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

@@ -34 +34 @@
   /// </summary>
   [Content(typeof(ItemBase), true)]
-  public partial class ItemBaseView : ViewBase {
+  public partial class ItemBaseView : ItemViewBase {
     /// <summary>
     /// Initializes a new instance of <see cref="ItemBaseView"/>.

trunk/sources/HeuristicLab.Core.Views/3.3/ItemViewBase.Designer.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Core.Views {
-  partial class ViewBase {
+  partial class ItemViewBase {
     /// <summary> 
     /// Required designer variable.

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

@@ -28 +28 @@
 using System.Xml;
 using System.Windows.Forms;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Core.Views {
@@ -33 +34 @@
   /// Base class for all visual representations.
   /// </summary>
-  public partial class ViewBase : HeuristicLab.MainForm.WindowsForms.ViewBase, IView {
+  public partial class ItemViewBase : ViewBase, IItemView {
     private IItem myItem;
     /// <summary>
@@ -73 +74 @@
     /// Initializes a new instance of <see cref="ViewBase"/> with the caption "View".
     /// </summary>
-    public ViewBase() {
+    public ItemViewBase() {
       InitializeComponent();
       Caption = "View";

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

@@ -32 +32 @@
   /// The visual representation of the description of operators.
   /// </summary>
-  public partial class OperatorBaseDescriptionView : ViewBase {
+  public partial class OperatorBaseDescriptionView : ItemViewBase {
     /// <summary>
     /// Gets or sets the operator whose description should be displayed.

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

@@ -34 +34 @@
   /// The visual representation of the information of the variables of an operator.
   /// </summary>
-  public partial class OperatorBaseVariableInfosView : ViewBase {
+  public partial class OperatorBaseVariableInfosView : ItemViewBase {
     /// <summary>
     /// Gets or sets the operator whose variable infos should be represented visually.

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

@@ -34 +34 @@
   /// The visual representation of the variables of an operator.
   /// </summary>
-  public partial class OperatorBaseVariablesView : ViewBase {
+  public partial class OperatorBaseVariablesView : ItemViewBase {
     private ChooseItemDialog chooseItemDialog;
 

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

@@ -35 +35 @@
   /// </summary>
   [Content(typeof(OperatorBase), true)]
-  public partial class OperatorBaseView : ViewBase {
+  public partial class OperatorBaseView : ItemViewBase {
     /// <summary>
     /// Gets or sets the operator to represent visually. 

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

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(OperatorGraph), true)]
-  public partial class OperatorGraphView : ViewBase {
+  public partial class OperatorGraphView : ItemViewBase {
     private ChooseOperatorDialog chooseOperatorDialog;
     private Dictionary<IOperator, IList<TreeNode>> operatorNodeTable;
@@ -184 +184 @@
       if (operatorsListView.SelectedItems.Count == 1) {
         IOperator op = (IOperator)operatorsListView.SelectedItems[0].Tag;
-        IView view = (IView)MainFormManager.CreateDefaultView(op);
-        if (view != null)
-          PluginManager.ControlManager.ShowControl(view);
+        IView view = MainFormManager.CreateDefaultView(op);
+        if (view != null) MainFormManager.MainForm.ShowView(view);
       }
     }
@@ -376 +375 @@
       if (operatorsListView.SelectedItems.Count == 1) {
         IOperator op = (IOperator)operatorsListView.SelectedItems[0].Tag;
-        IView view = (IView)MainFormManager.CreateDefaultView(op);
+        IView view = MainFormManager.CreateDefaultView(op);
         if (view != null) {
           viewToolStripMenuItem.Enabled = true;
@@ -388 +387 @@
     }
     private void viewToolStripMenuItem_Click(object sender, EventArgs e) {
-      IView view = (IView)((ToolStripMenuItem)sender).Tag;
-      PluginManager.ControlManager.ShowControl(view);
+      IView view = ((ToolStripMenuItem)sender).Tag as IView;
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     private void initialOperatorToolStripMenuItem_Click(object sender, EventArgs e) {
@@ -408 +407 @@
       if (graphTreeView.SelectedNode != null) {
         IOperator op = (IOperator)graphTreeView.SelectedNode.Tag;
-        IView view = (IView)MainFormManager.CreateDefaultView(op);
+        IView view = MainFormManager.CreateDefaultView(op);
         if (view != null) {
           viewToolStripMenuItem1.Enabled = true;

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorLibraryView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Core.Views {
-  partial class OperatorLibraryEditor {
+  partial class OperatorLibraryView {
     /// <summary> 
     /// Required designer variable.

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

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(OperatorLibrary), true)]
-  public partial class OperatorLibraryEditor : EditorBase {
+  public partial class OperatorLibraryView : ItemViewBase {
     private ChooseOperatorDialog chooseOperatorDialog;
 
@@ -52 +52 @@
     /// <c>Operator Library</c>.
     /// </summary>
-    public OperatorLibraryEditor() {
+    public OperatorLibraryView() {
       InitializeComponent();
       operatorsTreeView.TreeViewNodeSorter = new NodeSorter();
@@ -62 +62 @@
     /// </summary>
     /// <param name="operatorLibrary">The operator library to display.</param>
-    public OperatorLibraryEditor(IOperatorLibrary operatorLibrary)
+    public OperatorLibraryView(IOperatorLibrary operatorLibrary)
       : this() {
       OperatorLibrary = operatorLibrary;
@@ -204 +204 @@
         IOperator op = operatorsTreeView.SelectedNode.Tag as IOperator;
         if (op != null) {
-          IView view = (IView)MainFormManager.CreateDefaultView(op);
-          if (view != null)
-            PluginManager.ControlManager.ShowControl(view);
+          IView view = MainFormManager.CreateDefaultView(op);
+          if (view != null) MainFormManager.MainForm.ShowView(view);
         }
       }
@@ -279 +278 @@
         IOperator op = operatorsTreeView.SelectedNode.Tag as IOperator;
         if (op != null) {
-          IView view = (IView)MainFormManager.CreateDefaultView(op);
+          IItemView view = (IItemView)MainFormManager.CreateDefaultView(op);
           if (view != null) {
             viewToolStripMenuItem.Enabled = true;
@@ -288 +287 @@
     }
     private void viewToolStripMenuItem_Click(object sender, EventArgs e) {
-      IView view = (IView)viewToolStripMenuItem.Tag;
-      PluginManager.ControlManager.ShowControl(view);
+      IView view = viewToolStripMenuItem.Tag as IView;
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     #endregion

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

@@ -36 +36 @@
   /// </summary>
   [Content(typeof(Scope), true)]
-  public partial class ScopeView : ViewBase {
+  public partial class ScopeView : ItemViewBase {
     private Dictionary<IScope, TreeNode> scopeNodeTable;
     private Dictionary<IScope, bool> scopeExpandedTable;
@@ -133 +133 @@
       if(scopesTreeView.SelectedNode != null && scopesTreeView.SelectedNode.Tag != null) {
         IScope scope = (IScope)scopesTreeView.SelectedNode.Tag;
-        PluginManager.ControlManager.ShowControl(new VariablesScopeView(scope));
+        MainFormManager.MainForm.ShowView(new VariablesScopeView(scope));
       }
     }
@@ -201 +201 @@
     private void variablesToolStripMenuItem_Click(object sender, EventArgs e) {
       IScope scope = (IScope)scopesTreeView.SelectedNode.Tag;
-      PluginManager.ControlManager.ShowControl(new VariablesScopeView(scope));
+      MainFormManager.MainForm.ShowView(new VariablesScopeView(scope));
     }
     private void showViewToolStripMenuItem_Click(object sender, EventArgs e) {
       IItem item = (IItem)((ToolStripMenuItem)sender).Tag;
-      PluginManager.ControlManager.ShowControl((IControl)MainFormManager.CreateDefaultView(item));
+      IView view = MainFormManager.CreateDefaultView(item);
+      if (view != null) MainFormManager.MainForm.ShowView(view);
     }
     #endregion

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

@@ -34 +34 @@
   /// </summary>
   [Content(typeof(VariableInfo), true)]
-  public partial class VariableInfoView : ViewBase {
+  public partial class VariableInfoView : ItemViewBase {
     /// <summary>
     /// Gets or sets the variable information to represent visually.

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

@@ -34 +34 @@
   /// </summary>
   [Content(typeof(Variable), true)]
-  public partial class VariableView : ViewBase {
+  public partial class VariableView : ItemViewBase {
     private ChooseItemDialog chooseItemDialog;
 

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

@@ -35 +35 @@
   /// </summary>
   [Content(typeof(Scope))]
-  public partial class VariablesScopeView : ViewBase {
+  public partial class VariablesScopeView : ItemViewBase {
     private ChooseItemDialog chooseItemDialog;