Changeset 2520 for trunk/sources/HeuristicLab.AdvancedOptimizationFrontend

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.AdvancedOptimizationFrontend/3.3

Files:

• EditorForm.cs (modified) (1 diff)
• HeuristicLab.AdvancedOptimizationFrontend-3.3.csproj (modified) (1 diff)
• HeuristicLabAdvancedOptimizationFrontendPlugin.cs (modified) (1 diff)
• MainForm.cs (modified) (4 diffs)
• ViewForm.cs (modified) (1 diff)

trunk/sources/HeuristicLab.AdvancedOptimizationFrontend/3.3/EditorForm.cs

@@ -29 +29 @@
 using WeifenLuo.WinFormsUI.Docking;
 using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.AdvancedOptimizationFrontend {

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

@@ -119 +119 @@
   </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\3.2\HeuristicLab.MainForm-3.2.csproj">
+      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
+      <Name>HeuristicLab.MainForm-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

trunk/sources/HeuristicLab.AdvancedOptimizationFrontend/3.3/HeuristicLabAdvancedOptimizationFrontendPlugin.cs

@@ -33 +33 @@
   [PluginFile(Filename = "HeuristicLab.AdvancedOptimizationFrontend-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")]
   public class HeuristicLabAdvancedOptimizationFrontendPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.AdvancedOptimizationFrontend/3.3/MainForm.cs

@@ -32 +32 @@
 using HeuristicLab.Core;
 using System.IO;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.AdvancedOptimizationFrontend {
@@ -104 +106 @@
       if (control is IEditor)
         content = new EditorForm((IEditor)control);
-      else if (control is IView)
-        content = new ViewForm((IView)control);
+      else if (control is HeuristicLab.Core.Views.IView)
+        content = new ViewForm((HeuristicLab.Core.Views.IView)control);
       else
         throw new InvalidOperationException("Control is neither a view nor an editor.");
@@ -178 +180 @@
           IEditable editable = task.storable as IEditable;
           if (editable != null)
-            editor = editable.CreateEditor();
+            editor = (IEditor)MainFormManager.CreateDefaultView(editable);
         }
         if (editor == null)
@@ -243 +245 @@
         MessageBox.Show("The selected item is not editable.", "Editable Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
       } else {
-        IEditor editor = editable.CreateEditor();
+        IEditor editor = (IEditor)MainFormManager.CreateDefaultView(editable);
         if (editor == null) {
           MessageBox.Show("The selected item doesn't provide an editor.", "Editor Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

trunk/sources/HeuristicLab.AdvancedOptimizationFrontend/3.3/ViewForm.cs

@@ -29 +29 @@
 using WeifenLuo.WinFormsUI.Docking;
 using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.AdvancedOptimizationFrontend {