Changeset 510 for trunk

Timestamp:

08/13/08 13:20:33 (16 years ago)

Author:

gkronber

Message:

implemented #255 (CEDMA console should have a refresh button for the treeview with agents and results). Also deleted the obsolete timer in ConsoleEditor.

Location:

trunk/sources/HeuristicLab.CEDMA.Core

Files:

• AgentList.cs (modified) (3 diffs)
• AgentListView.Designer.cs (modified) (4 diffs)
• AgentListView.cs (modified) (2 diffs)
• ConsoleEditor.cs (modified) (5 diffs)
• ConsoleEditor.resx (modified) (1 diff)

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

@@ -41 +41 @@
         database = value;
         ReloadList();
+        FireChanged();
       }
     }
@@ -52 +53 @@
         agentList.Add(newAgent);
       }
-      FireChanged();
     }
 
@@ -68 +68 @@
       agent.Id = id;
       agentList.Add(agent);
+      FireChanged();
     }
 
     public IEnumerator<IAgent> GetEnumerator() {
+      ReloadList();
       return agentList.GetEnumerator();
     }

trunk/sources/HeuristicLab.CEDMA.Core/AgentListView.Designer.cs

@@ -50 +50 @@
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.agentsGroupBox = new System.Windows.Forms.GroupBox();
+      this.agentTreeView = new System.Windows.Forms.TreeView();
       this.detailsGroupBox = new System.Windows.Forms.GroupBox();
       this.addButton = new System.Windows.Forms.Button();
-      this.agentTreeView = new System.Windows.Forms.TreeView();
+      this.refreshButton = new System.Windows.Forms.Button();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
@@ -90 +91 @@
       this.agentsGroupBox.Text = "&Agents";
       // 
+      // agentTreeView
+      // 
+      this.agentTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.agentTreeView.Location = new System.Drawing.Point(3, 16);
+      this.agentTreeView.Name = "agentTreeView";
+      this.agentTreeView.Size = new System.Drawing.Size(129, 136);
+      this.agentTreeView.TabIndex = 0;
+      this.agentTreeView.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.agentTreeView_BeforeExpand);
+      this.agentTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.agentTreeView_AfterSelect);
+      // 
       // detailsGroupBox
       // 
@@ -111 +122 @@
       this.addButton.Click += new System.EventHandler(this.addButton_Click);
       // 
-      // agentTreeView
+      // refreshButton
       // 
-      this.agentTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.agentTreeView.Location = new System.Drawing.Point(3, 16);
-      this.agentTreeView.Name = "agentTreeView";
-      this.agentTreeView.Size = new System.Drawing.Size(129, 136);
-      this.agentTreeView.TabIndex = 0;
-      this.agentTreeView.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.agentTreeView_BeforeExpand);
-      this.agentTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.agentTreeView_AfterSelect);
+      this.refreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.refreshButton.Location = new System.Drawing.Point(81, 161);
+      this.refreshButton.Name = "refreshButton";
+      this.refreshButton.Size = new System.Drawing.Size(75, 23);
+      this.refreshButton.TabIndex = 2;
+      this.refreshButton.Text = "&Refresh";
+      this.refreshButton.UseVisualStyleBackColor = true;
+      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
       // 
       // AgentListView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.refreshButton);
       this.Controls.Add(this.addButton);
       this.Controls.Add(this.splitContainer1);
@@ -143 +156 @@
     private System.Windows.Forms.Button addButton;
     private TreeView agentTreeView;
+    private Button refreshButton;
   }
 }

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

@@ -73 +73 @@
     private void addButton_Click(object sender, EventArgs e) {
       AgentList.CreateAgent();
-      UpdateControls();
     }
     #endregion
@@ -120 +119 @@
       }
     }
+
+    private void refreshButton_Click(object sender, EventArgs e) {
+      UpdateControls();
+    }
   }
 }

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

@@ -39 +39 @@
     private Label projectLabel;
     private Button newButton;
-    private Timer refreshTimer;
     private System.ComponentModel.IContainer components;
     private Button opLibButton;
@@ -51 +50 @@
 
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
       this.uriTextBox = new System.Windows.Forms.TextBox();
       this.uriLabel = new System.Windows.Forms.Label();
@@ -60 +58 @@
       this.projectLabel = new System.Windows.Forms.Label();
       this.newButton = new System.Windows.Forms.Button();
-      this.refreshTimer = new System.Windows.Forms.Timer(this.components);
       this.opLibButton = new System.Windows.Forms.Button();
       this.label1 = new System.Windows.Forms.Label();
@@ -143 +140 @@
       this.newButton.Text = "New...";
       this.newButton.UseVisualStyleBackColor = true;
-      // 
-      // refreshTimer
-      // 
-      this.refreshTimer.Interval = 3000;
-      this.refreshTimer.Tick += new System.EventHandler(this.refreshTimer_Tick);
       // 
       // opLibButton
@@ -197 +189 @@
         agentsPage.Controls.Add((Control)console.AgentList.CreateView());
         agentsPage.Controls[0].Dock = DockStyle.Fill;
-        refreshTimer.Enabled = true;
         opLibButton.Enabled = true;
         opLibButton.Enabled = true;
       } catch(CommunicationException ex) {
-        // TASK create helper class for error reporting
         MessageBox.Show("Exception while trying to connect to " + uriTextBox.Text + "\n" + ex.Message);
       }
-    }
-
-    private void refreshTimer_Tick(object sender, EventArgs e) {
-      refreshTimer.Stop();
-      UpdateControls();
-      refreshTimer.Enabled = true;
     }
 

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

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="refreshTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>