Changeset 1287 for trunk/sources/HeuristicLab.CEDMA.Core/ConsoleEditor.cs

Timestamp:

03/08/09 12:48:18 (16 years ago)

Author:

gkronber

Message:

Merged change sets from CEDMA branch to trunk:

• r957:r990 r992 r1003 r1041:1044 (#419)
• r1051:1053 r1060 (#419, #224)
• r1072:1075 r1104:1106 r1108:1109 r1115:1116 r1129:1130 r1151 r1156 (#419)
• r1201:1202 (#224)
• r1208 (#487)
• r1214:1217 r1230:1231 (#419)
• r1235:1236 r1238:1239 r1245 (#224)
• r1246 (#505)
• r1251:1254 r1262:1263 (#224)
• r1265:1266, r1275:1277 (#419)

File:

• trunk/sources/HeuristicLab.CEDMA.Core/ConsoleEditor.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.CEDMA.Core/ConsoleEditor.cs

@@ -36 +36 @@
     private System.Windows.Forms.Label uriLabel;
     private Button connectButton;
-    private Button openOpLibButton;
-    private Label label1;
-    private Label resultsLabel;
-    private Button openResultsButton;
-    private Button openAgentsButton;
-    private Label agentsLabel;
+    private Panel serverPanel;
     private Console console;
 
@@ -47 +42 @@
       InitializeComponent();
       this.console = console;
+      serverPanel.Enabled = false;
     }
 
+    #region autogenerated code
     private void InitializeComponent() {
       this.uriTextBox = new System.Windows.Forms.TextBox();
       this.uriLabel = new System.Windows.Forms.Label();
       this.connectButton = new System.Windows.Forms.Button();
-      this.openOpLibButton = new System.Windows.Forms.Button();
-      this.label1 = new System.Windows.Forms.Label();
-      this.resultsLabel = new System.Windows.Forms.Label();
-      this.openResultsButton = new System.Windows.Forms.Button();
-      this.openAgentsButton = new System.Windows.Forms.Button();
-      this.agentsLabel = new System.Windows.Forms.Label();
+      this.serverPanel = new System.Windows.Forms.Panel();
       this.SuspendLayout();
       // 
@@ -87 +79 @@
       this.connectButton.Click += new System.EventHandler(this.connectButton_Click);
       // 
-      // openOpLibButton
+      // serverPanel
       // 
-      this.openOpLibButton.Enabled = false;
-      this.openOpLibButton.Location = new System.Drawing.Point(94, 85);
-      this.openOpLibButton.Name = "openOpLibButton";
-      this.openOpLibButton.Size = new System.Drawing.Size(75, 23);
-      this.openOpLibButton.TabIndex = 7;
-      this.openOpLibButton.Text = "&Open";
-      this.openOpLibButton.UseVisualStyleBackColor = true;
-      this.openOpLibButton.Click += new System.EventHandler(this.opLibButton_Click);
-      // 
-      // label1
-      // 
-      this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(3, 90);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(85, 13);
-      this.label1.TabIndex = 8;
-      this.label1.Text = "Operator Library:";
-      // 
-      // resultsLabel
-      // 
-      this.resultsLabel.AutoSize = true;
-      this.resultsLabel.Location = new System.Drawing.Point(43, 61);
-      this.resultsLabel.Name = "resultsLabel";
-      this.resultsLabel.Size = new System.Drawing.Size(45, 13);
-      this.resultsLabel.TabIndex = 9;
-      this.resultsLabel.Text = "Results:";
-      // 
-      // openResultsButton
-      // 
-      this.openResultsButton.Enabled = false;
-      this.openResultsButton.Location = new System.Drawing.Point(94, 56);
-      this.openResultsButton.Name = "openResultsButton";
-      this.openResultsButton.Size = new System.Drawing.Size(75, 23);
-      this.openResultsButton.TabIndex = 10;
-      this.openResultsButton.Text = "&Open";
-      this.openResultsButton.UseVisualStyleBackColor = true;
-      this.openResultsButton.Click += new System.EventHandler(this.openChartButton_Click);
-      // 
-      // openAgentsButton
-      // 
-      this.openAgentsButton.Enabled = false;
-      this.openAgentsButton.Location = new System.Drawing.Point(94, 27);
-      this.openAgentsButton.Name = "openAgentsButton";
-      this.openAgentsButton.Size = new System.Drawing.Size(75, 23);
-      this.openAgentsButton.TabIndex = 12;
-      this.openAgentsButton.Text = "&Open";
-      this.openAgentsButton.UseVisualStyleBackColor = true;
-      this.openAgentsButton.Click += new System.EventHandler(this.openAgentsButton_Click);
-      // 
-      // agentsLabel
-      // 
-      this.agentsLabel.AutoSize = true;
-      this.agentsLabel.Location = new System.Drawing.Point(45, 32);
-      this.agentsLabel.Name = "agentsLabel";
-      this.agentsLabel.Size = new System.Drawing.Size(43, 13);
-      this.agentsLabel.TabIndex = 11;
-      this.agentsLabel.Text = "Agents:";
+      this.serverPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.serverPanel.Location = new System.Drawing.Point(3, 29);
+      this.serverPanel.Name = "serverPanel";
+      this.serverPanel.Size = new System.Drawing.Size(439, 157);
+      this.serverPanel.TabIndex = 4;
       // 
       // ConsoleEditor
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.Controls.Add(this.openAgentsButton);
-      this.Controls.Add(this.agentsLabel);
-      this.Controls.Add(this.openResultsButton);
-      this.Controls.Add(this.resultsLabel);
-      this.Controls.Add(this.label1);
-      this.Controls.Add(this.openOpLibButton);
+      this.Controls.Add(this.serverPanel);
       this.Controls.Add(this.connectButton);
       this.Controls.Add(this.uriLabel);
@@ -166 +103 @@
     }
 
+    #endregion
+
     private void connectButton_Click(object sender, EventArgs e) {
       try {
         console.Connect(uriTextBox.Text);
         connectButton.Enabled = false;
-        openOpLibButton.Enabled = true;
-        openAgentsButton.Enabled = true;
-        openResultsButton.Enabled = true;
+        serverPanel.Enabled = true;
+        serverPanel.Controls.Clear();
+        Control dataSetListView = (Control)console.DataSetList.CreateView();
+        dataSetListView.Dock = DockStyle.Fill;
+        serverPanel.Controls.Add(dataSetListView);
       } catch(CommunicationException ex) {
         MessageBox.Show("Exception while trying to connect to " + uriTextBox.Text + "\n" + ex.Message);
       }
     }
-
-    private void opLibButton_Click(object sender, EventArgs e) {
-      IOperatorLibrary opLib = console.OperatorLibrary;
-      if(opLib != null) {
-        IView view = opLib.CreateView();
-        if(view != null)
-          PluginManager.ControlManager.ShowControl(view);
-      }
-    }
-
-    private void openChartButton_Click(object sender, EventArgs e) {
-      PluginManager.ControlManager.ShowControl(console.ResultsList.CreateView());
-    }
-
-    private void openAgentsButton_Click(object sender, EventArgs e) {
-      PluginManager.ControlManager.ShowControl(console.AgentList.CreateView());
-    }
   }
 }