Changeset 2520 for trunk/sources/HeuristicLab.Routing.TSP/3.3

Timestamp:

11/23/09 11:08:34 (15 years ago)

Author:

swagner

Message:

Implemented first draft of MainForm support in HeuristicLab.Core/HeuristicLab.Core.Views and all other depending plugins (#770)

Location:

trunk/sources/HeuristicLab.Routing.TSP/3.3

Files:

• HeuristicLab.Routing.TSP-3.3.csproj (modified) (2 diffs)
• HeuristicLabRoutingTSPPlugin.cs (modified) (1 diff)
• TSPInjector.cs (modified) (1 diff)
• TSPInjectorView.Designer.cs (modified) (2 diffs)
• TSPInjectorView.cs (modified) (2 diffs)
• TSPTour.cs (modified) (1 diff)
• TSPTourView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Routing.TSP/3.3/HeuristicLab.Routing.TSP-3.3.csproj

@@ -114 +114 @@
       <Name>HeuristicLab.Charting-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
+      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
+      <Name>HeuristicLab.Core.Views-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
@@ -121 +125 @@
       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
       <Name>HeuristicLab.Data-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
+      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
+      <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
+      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
+      <Name>HeuristicLab.MainForm-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">

trunk/sources/HeuristicLab.Routing.TSP/3.3/HeuristicLabRoutingTSPPlugin.cs

@@ -32 +32 @@
   [PluginFile(Filename = "HeuristicLab.Routing.TSP-3.3.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.Core-3.3")]
+  [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
   [Dependency(Dependency = "HeuristicLab.Data-3.3")]
+  [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
+  [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
   [Dependency(Dependency = "HeuristicLab.Operators-3.3")]
   [Dependency(Dependency = "HeuristicLab.Permutation-3.3")]

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPInjector.cs

@@ -55 +55 @@
 
     /// <summary>
-    /// Creates a new instance of <see cref="TSPInjectorView"/> to display the current instance.
-    /// </summary>
-    /// <returns>The created view as <see cref="TSPInjectorView"/>.</returns>
-    public override IView CreateView() {
-      return new TSPInjectorView(this);
-    }
-
-    /// <summary>
     /// Adds a new TSP to the given <paramref name="scope"/>, through adding the needed variables.
     /// </summary>

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPInjectorView.Designer.cs

@@ -56 +56 @@
       this.dataTabPage = new System.Windows.Forms.TabPage();
       this.variableInfosTabPage = new System.Windows.Forms.TabPage();
-      this.operatorBaseVariableInfosView = new HeuristicLab.Core.OperatorBaseVariableInfosView();
+      this.operatorBaseVariableInfosView = new HeuristicLab.Core.Views.OperatorBaseVariableInfosView();
       this.descriptionTabPage = new System.Windows.Forms.TabPage();
-      this.operatorBaseDescriptionView = new HeuristicLab.Core.OperatorBaseDescriptionView();
+      this.operatorBaseDescriptionView = new HeuristicLab.Core.Views.OperatorBaseDescriptionView();
       this.tabControl.SuspendLayout();
       this.dataTabPage.SuspendLayout();
@@ -242 +242 @@
     private System.Windows.Forms.TabPage dataTabPage;
     private System.Windows.Forms.TabPage variableInfosTabPage;
-    private HeuristicLab.Core.OperatorBaseVariableInfosView operatorBaseVariableInfosView;
+    private HeuristicLab.Core.Views.OperatorBaseVariableInfosView operatorBaseVariableInfosView;
     private System.Windows.Forms.TabPage descriptionTabPage;
-    private HeuristicLab.Core.OperatorBaseDescriptionView operatorBaseDescriptionView;
+    private HeuristicLab.Core.Views.OperatorBaseDescriptionView operatorBaseDescriptionView;
   }
 }

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPInjectorView.cs

@@ -30 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Routing.TSP {
@@ -35 +37 @@
   /// Class to represent a <see cref="TSPInjector"/> visually.
   /// </summary>
+  [Content(typeof(TSPInjector), true)]
   public partial class TSPInjectorView : ViewBase {
     /// <summary>

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPTour.cs

@@ -86 +86 @@
 
     /// <summary>
-    /// Creates a new instance of <see cref="TSPTourView"/> to display the current instance.
-    /// </summary>
-    /// <returns>The created view as <see cref="TSPTourView"/>.</returns>
-    public override IView CreateView() {
-      return new TSPTourView(this);
-    }
-
-    /// <summary>
     /// Occurs when the coordinates of the current instance have been changed.
     /// </summary>

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPTourView.cs

@@ -31 +31 @@
 using HeuristicLab.Permutation;
 using HeuristicLab.Charting;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Routing.TSP {
@@ -36 +38 @@
   /// Class for the visual representation of a <see cref="TSPTour"/>.
   /// </summary>
+  [Content(typeof(TSPTour), true)]
   public partial class TSPTourView : ViewBase {
     /// <summary>