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

Files:

• HeuristicLab.Operators.Programmable-3.3.csproj (modified) (2 diffs)
• HeuristicLabOperatorsProgrammablePlugin.cs (modified) (1 diff)
• ProgrammableOperator.cs (modified) (1 diff)
• ProgrammableOperatorView.Designer.cs (modified) (2 diffs)
• ProgrammableOperatorView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj

@@ -100 +100 @@
   </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>
@@ -107 +111 @@
       <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.Operators.Programmable/3.3/HeuristicLabOperatorsProgrammablePlugin.cs

@@ -29 +29 @@
   [PluginFile(Filename = "HeuristicLab.Operators.Programmable-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.Persistence-3.3")]

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

@@ -189 +189 @@
     }
 
-    public override IView CreateView() {
-      return new ProgrammableOperatorView(this);
-    }
-
     public event EventHandler DescriptionChanged;
     protected virtual void OnDescriptionChanged() {

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.Designer.cs

@@ -54 +54 @@
       this.removeVariableInfoButton = new System.Windows.Forms.Button();
       this.addVariableInfoButton = new System.Windows.Forms.Button();
-      this.operatorBaseVariableInfosView = new HeuristicLab.Core.OperatorBaseVariableInfosView();
+      this.operatorBaseVariableInfosView = new HeuristicLab.Core.Views.OperatorBaseVariableInfosView();
       this.variablesTabPage = new System.Windows.Forms.TabPage();
-      this.operatorBaseVariablesView = new HeuristicLab.Core.OperatorBaseVariablesView();
+      this.operatorBaseVariablesView = new HeuristicLab.Core.Views.OperatorBaseVariablesView();
       this.constraintsTabPage = new System.Windows.Forms.TabPage();
-      this.constrainedItemBaseView = new HeuristicLab.Core.ConstrainedItemBaseView();
+      this.constrainedItemBaseView = new HeuristicLab.Core.Views.ConstrainedItemBaseView();
       this.descriptionTabPage = new System.Windows.Forms.TabPage();
       this.descriptionTextBox = new System.Windows.Forms.TextBox();
@@ -275 +275 @@
     private System.Windows.Forms.TextBox codeTextBox;
     private System.Windows.Forms.TabPage variableInfosTabPage;
-    private HeuristicLab.Core.OperatorBaseVariableInfosView operatorBaseVariableInfosView;
+    private HeuristicLab.Core.Views.OperatorBaseVariableInfosView operatorBaseVariableInfosView;
     private System.Windows.Forms.TabPage variablesTabPage;
-    private HeuristicLab.Core.OperatorBaseVariablesView operatorBaseVariablesView;
+    private HeuristicLab.Core.Views.OperatorBaseVariablesView operatorBaseVariablesView;
     private System.Windows.Forms.TabPage constraintsTabPage;
-    private HeuristicLab.Core.ConstrainedItemBaseView constrainedItemBaseView;
+    private HeuristicLab.Core.Views.ConstrainedItemBaseView constrainedItemBaseView;
     private System.Windows.Forms.TabPage descriptionTabPage;
     private System.Windows.Forms.TextBox descriptionTextBox;

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.cs

@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Operators;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Operators.Programmable {
+  [Content(typeof(ProgrammableOperator), true)]
   public partial class ProgrammableOperatorView : ViewBase {
     public ProgrammableOperator ProgrammableOperator {
@@ -102 +105 @@
       }
       catch (Exception ex) {
-        Auxiliary.ShowErrorMessageBox(ex);
+        HeuristicLab.Core.Views.Auxiliary.ShowErrorMessageBox(ex);
       }
     }
@@ -109 +112 @@
       if (dialog.ShowDialog(this) == DialogResult.OK) {
         if (ProgrammableOperator.GetVariableInfo(dialog.VariableInfo.FormalName) != null)
-          Auxiliary.ShowErrorMessageBox("A variable info with the same formal name already exists.");
+          HeuristicLab.Core.Views.Auxiliary.ShowErrorMessageBox("A variable info with the same formal name already exists.");
         else
           ProgrammableOperator.AddVariableInfo(dialog.VariableInfo);