Changeset 2824

Timestamp:

02/17/10 23:11:32 (15 years ago)

Author:

gkronber

Message:

Quick fix: ported CEDMA server form to HL.MainForm to be able to open and edit algorithms. #758 (CEDMA server should be based on new HL.MainForm)

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• DispatcherView.Designer.cs (modified) (5 diffs)
• DispatcherView.cs (modified) (2 diffs)
• EngineViewWrapper.cs (added)
• HeuristicLab.CEDMA.Server-3.3.csproj (modified) (2 diffs)
• IUserInterfaceItemProvider.cs (added)
• MainForm.cs (added)
• Server.cs (modified) (1 diff)
• ServerApplication.cs (modified) (1 diff)
• ServerView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/DispatcherView.Designer.cs

@@ -52 +52 @@
       this.testLabel = new System.Windows.Forms.Label();
       this.setAllButton = new System.Windows.Forms.Button();
+      this.editEngineButton = new System.Windows.Forms.Button();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
@@ -130 +131 @@
       // 
       this.learningTaskGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.learningTaskGroupBox.Controls.Add(this.editEngineButton);
       this.learningTaskGroupBox.Controls.Add(this.setAlgorithmDefault);
       this.learningTaskGroupBox.Controls.Add(this.autoregressiveLabel);
@@ -193 +195 @@
       this.algorithmsListBox.Size = new System.Drawing.Size(331, 124);
       this.algorithmsListBox.TabIndex = 4;
+      this.algorithmsListBox.SelectedIndexChanged += new System.EventHandler(this.algorithmsListBox_SelectedIndexChanged);
       this.algorithmsListBox.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.algorithmsListBox_ItemCheck);
       // 
@@ -380 +383 @@
       this.setAllButton.UseVisualStyleBackColor = true;
       this.setAllButton.Click += new System.EventHandler(this.setAllButton_Click);
+      // 
+      // editEngineButton
+      // 
+      this.editEngineButton.Location = new System.Drawing.Point(108, 292);
+      this.editEngineButton.Name = "editEngineButton";
+      this.editEngineButton.Size = new System.Drawing.Size(75, 23);
+      this.editEngineButton.TabIndex = 37;
+      this.editEngineButton.Text = "Edit engine";
+      this.editEngineButton.UseVisualStyleBackColor = true;
+      this.editEngineButton.Click += new System.EventHandler(this.editEngineButton_Click);
       // 
       // DispatcherView
@@ -431 +444 @@
     private System.Windows.Forms.CheckBox autoregressiveCheckBox;
     private System.Windows.Forms.Button setAlgorithmDefault;
+    private System.Windows.Forms.Button editEngineButton;
   }
 }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/DispatcherView.cs

@@ -18 +18 @@
       this.dispatcher = dispatcher;
       InitializeComponent();
+      editEngineButton.Enabled = false;
       dispatcher.Changed += (sender, args) => UpdateControls();
       UpdateControls();
@@ -246 +247 @@
     }
 
+    private void editEngineButton_Click(object sender, EventArgs e) {
+      var algo = (HeuristicLab.Modeling.IAlgorithm)algorithmsListBox.SelectedItem;
+      HeuristicLab.PluginInfrastructure.ControlManager.Manager.ShowControl(algo.Engine.CreateView());
+    }
+
+    private void algorithmsListBox_SelectedIndexChanged(object sender, EventArgs e) {
+      editEngineButton.Enabled = algorithmsListBox.SelectedItems.Count > 0;
+    }
+
   }
 }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLab.CEDMA.Server-3.3.csproj

@@ -91 +91 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="EngineViewWrapper.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="IUserInterfaceItemProvider.cs" />
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="ProblemSpecification.cs" />
     <Compile Include="LearningTask.cs" />
@@ -159 +166 @@
       <Project>{545CE756-98D8-423B-AC2E-6E7D70926E5C}</Project>
       <Name>HeuristicLab.Grid-3.2</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.Modeling.Database.SQLServerCompact\3.2\HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj">

trunk/sources/HeuristicLab.CEDMA.Server/3.3/Server.cs

@@ -79 +79 @@
 
     public IView CreateView() {
-      return new ServerView(this);
+      return null;
     }
     #endregion

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ServerApplication.cs

@@ -30 +30 @@
   class ServerApplication : ApplicationBase {
     public override void Run() {
-      Server server = new Server();
-      Form mainForm = new Form();
-      mainForm.Size = new System.Drawing.Size(800, 600);
-      UserControl serverControl = (UserControl)server.CreateView();
-      serverControl.Dock = DockStyle.Fill;
-      mainForm.Controls.Add(serverControl);
-      mainForm.Text = "CEDMA";
+      MainForm mainForm = new MainForm(typeof(IUserInterfaceItemProvider));
+      mainForm.Title = "CEDMA Server Controller";
+      PluginInfrastructure.ControlManager.RegisterManager(mainForm);
       Application.Run(mainForm);
     }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ServerView.cs

@@ -39 +39 @@
 
 namespace HeuristicLab.CEDMA.Server {
-  public partial class ServerView : ViewBase {
+  public partial class ServerView : HeuristicLab.MainForm.WindowsForms.View {
     private Server server;
 
@@ -46 +46 @@
       this.server = server;
       InitializeComponent();
+      Caption = "Cedma Server Controller";
     }