Changeset 2520 for trunk/sources/HeuristicLab.ThreadParallelEngine/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.ThreadParallelEngine/3.3

Files:

• HeuristicLab.ThreadParallelEngine-3.3.csproj (modified) (1 diff)
• HeuristicLabThreadParallelEnginePlugin.cs (modified) (1 diff)
• ThreadParallelEngine.cs (modified) (2 diffs)
• ThreadParallelEngineEditor.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/HeuristicLab.ThreadParallelEngine-3.3.csproj

@@ -98 +98 @@
   </ItemGroup>
   <ItemGroup>
+    <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>
       <Name>HeuristicLab.Core-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.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">

trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/HeuristicLabThreadParallelEnginePlugin.cs

@@ -32 +32 @@
   [PluginFile(Filename = "HeuristicLab.ThreadParallelEngine-3.3.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.Core-3.3")]
+  [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
+  [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
+  [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
   public class HeuristicLabThreadParallelEnginePlugin : PluginBase {
   }

trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngine.cs

@@ -32 +32 @@
   /// Implementation of an engine being able to run in parallel with threads.
   /// </summary>
-  public class ThreadParallelEngine : EngineBase, IEditable {
+  public class ThreadParallelEngine : EngineBase {
     #region Inner Class Task
     private class TaskList {
@@ -77 +77 @@
       clone.myWorkers = Workers;
       return clone;
-    }
-
-    /// <summary>
-    /// Creates a new instance of <see cref="ThreadParallelEngineEditor"/> to display the current 
-    /// instance.
-    /// </summary>
-    /// <returns>The created instance as <see cref="ThreadParallelEngineEditor"/>.</returns>
-    public override IView CreateView() {
-      return new ThreadParallelEngineEditor(this);
-    }
-    /// <summary>
-    /// Creates a new instance of <see cref="ThreadParallelEngineEditor"/>.
-    /// </summary>
-    /// <returns>The created instance as <see cref="ThreadParallelEngineEditor"/>.</returns>
-    public virtual IEditor CreateEditor() {
-      return new ThreadParallelEngineEditor(this);
     }
 

trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/ThreadParallelEngineEditor.cs

@@ -28 +28 @@
 using System.Windows.Forms;
 using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.ThreadParallelEngine {
@@ -33 +35 @@
   /// Visual representation of a <see cref="ThreadParallelEngine"/>.
   /// </summary>
+  [Content(typeof(ThreadParallelEngine), true)]
   public partial class ThreadParallelEngineEditor : EngineBaseEditor {
     /// <summary>