Changeset 989 for branches/CEDMA-Refactoring-Ticket419

Timestamp:

12/15/08 01:26:25 (16 years ago)

Author:

gkronber

Message:

worked on #419 (Refactor CEDMA plugins)

Location:

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core

Files:

• DataSetList.cs (modified) (2 diffs)
• DataSetListView.Designer.cs (modified) (6 diffs)
• DataSetListView.cs (modified) (3 diffs)
• DataSetListView.resx (modified) (1 diff)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/DataSetList.cs

@@ -58 +58 @@
 
     private void ReloadList() {
-      throw new NotImplementedException();
-      //foreach( a in database.GetAgents()) {
-      //  Agent newAgent = new Agent(Database, a.Id);
-      //  newAgent.Name = a.Name;
-      //  newAgent.Status = a.Status;
-      //  lock(agentList) {
-      //    agentList.Add(newAgent);
-      //  }
-      //  FireChanged();
-      //}
-    }
+      IList<Statement> statements = store.Select(new Statement(Ontology.AnyEntity, Ontology.PredicateInstanceOf, Ontology.TypeDataSet));
 
-    internal static void CreateDataSet() {
-      throw new NotImplementedException();
+      foreach(Statement s in statements) {
+        DataSet d = new DataSet(store, s.Subject);
+        lock(dataSetList) {
+          dataSetList.Add(d);
+        }
+        FireChanged();
+      }
     }
 
@@ -85 +80 @@
       return GetEnumerator();
     }
+
+    public void Add(DataSet dataSet) {
+      dataSetList.Add(dataSet);
+    }
   }
 }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/DataSetListView.Designer.cs

@@ -48 +48 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-      this.agentsGroupBox = new System.Windows.Forms.GroupBox();
-      this.agentTreeView = new System.Windows.Forms.TreeView();
+      this.dataSetsGroupBox = new System.Windows.Forms.GroupBox();
+      this.dataSetsTreeView = new System.Windows.Forms.TreeView();
       this.detailsGroupBox = new System.Windows.Forms.GroupBox();
       this.addButton = new System.Windows.Forms.Button();
       this.refreshButton = new System.Windows.Forms.Button();
-      this.entryContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
-      this.exportAllResultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
       this.splitContainer1.SuspendLayout();
-      this.agentsGroupBox.SuspendLayout();
-      this.entryContextMenuStrip.SuspendLayout();
+      this.dataSetsGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -75 +71 @@
       // splitContainer1.Panel1
       // 
-      this.splitContainer1.Panel1.Controls.Add(this.agentsGroupBox);
+      this.splitContainer1.Panel1.Controls.Add(this.dataSetsGroupBox);
       // 
       // splitContainer1.Panel2
@@ -84 +80 @@
       this.splitContainer1.TabIndex = 0;
       // 
-      // agentsGroupBox
+      // dataSetsGroupBox
       // 
-      this.agentsGroupBox.Controls.Add(this.agentTreeView);
-      this.agentsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.agentsGroupBox.Location = new System.Drawing.Point(0, 0);
-      this.agentsGroupBox.Name = "agentsGroupBox";
-      this.agentsGroupBox.Size = new System.Drawing.Size(135, 155);
-      this.agentsGroupBox.TabIndex = 0;
-      this.agentsGroupBox.TabStop = false;
-      this.agentsGroupBox.Text = "&Agents";
+      this.dataSetsGroupBox.Controls.Add(this.dataSetsTreeView);
+      this.dataSetsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.dataSetsGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.dataSetsGroupBox.Name = "dataSetsGroupBox";
+      this.dataSetsGroupBox.Size = new System.Drawing.Size(135, 155);
+      this.dataSetsGroupBox.TabIndex = 0;
+      this.dataSetsGroupBox.TabStop = false;
+      this.dataSetsGroupBox.Text = "&Data Sets";
       // 
       // 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);
+      this.dataSetsTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.dataSetsTreeView.Location = new System.Drawing.Point(3, 16);
+      this.dataSetsTreeView.Name = "agentTreeView";
+      this.dataSetsTreeView.Size = new System.Drawing.Size(129, 136);
+      this.dataSetsTreeView.TabIndex = 0;
+      this.dataSetsTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.dataSetsTreeView_AfterSelect);
       // 
       // detailsGroupBox
@@ -137 +132 @@
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
       // 
-      // entryContextMenuStrip
-      // 
-      this.entryContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.exportAllResultsToolStripMenuItem});
-      this.entryContextMenuStrip.Name = "entryContextMenuStrip";
-      this.entryContextMenuStrip.Size = new System.Drawing.Size(166, 26);
-      // 
-      // exportAllResultsToolStripMenuItem
-      // 
-      this.exportAllResultsToolStripMenuItem.Name = "exportAllResultsToolStripMenuItem";
-      this.exportAllResultsToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
-      this.exportAllResultsToolStripMenuItem.Text = "Export all results";
-      this.exportAllResultsToolStripMenuItem.Click += new System.EventHandler(this.exportAllResultsToolStripMenuItem_Click);
-      // 
-      // AgentListView
+      // DataSetListView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -157 +138 @@
       this.Controls.Add(this.addButton);
       this.Controls.Add(this.splitContainer1);
-      this.Name = "AgentListView";
+      this.Name = "DataSetListView";
       this.Size = new System.Drawing.Size(276, 184);
       this.splitContainer1.Panel1.ResumeLayout(false);
       this.splitContainer1.Panel2.ResumeLayout(false);
       this.splitContainer1.ResumeLayout(false);
-      this.agentsGroupBox.ResumeLayout(false);
-      this.entryContextMenuStrip.ResumeLayout(false);
+      this.dataSetsGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -171 +151 @@
 
     private System.Windows.Forms.SplitContainer splitContainer1;
-    private System.Windows.Forms.GroupBox agentsGroupBox;
+    private System.Windows.Forms.GroupBox dataSetsGroupBox;
     private System.Windows.Forms.GroupBox detailsGroupBox;
     private System.Windows.Forms.Button addButton;
-    private TreeView agentTreeView;
+    private TreeView dataSetsTreeView;
     private Button refreshButton;
-    private ContextMenuStrip entryContextMenuStrip;
-    private ToolStripMenuItem exportAllResultsToolStripMenuItem;
   }
 }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/DataSetListView.cs

@@ -56 +56 @@
       if(DataSetList == null) {
         Caption = "Data Sets View";
-        agentTreeView.Enabled = false;
+        dataSetsTreeView.Enabled = false;
       } else {
-        agentTreeView.Enabled = true;
-        agentTreeView.Nodes.Clear();
+        dataSetsTreeView.Enabled = true;
+        dataSetsTreeView.Nodes.Clear();
         foreach(DataSet dataSet in DataSetList) {
           TreeNode node = new TreeNode();
@@ -65 +65 @@
           node.Tag = dataSet;
           node.Nodes.Add("dummy");
-          node.ContextMenuStrip = entryContextMenuStrip;
-          agentTreeView.Nodes.Add(node);
+          dataSetsTreeView.Nodes.Add(node);
         }
       }
@@ -73 +72 @@
     #region Button Events
     private void addButton_Click(object sender, EventArgs e) {
-      DataSetList.CreateDataSet();
+      DataSet dataSet = new DataSet();
+      DataSetList.Add(dataSet);
+      UpdateControls();
     }
     #endregion
 
-    private void agentTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
+    private void dataSetsTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
       if(detailsGroupBox.Controls.Count > 0)
         detailsGroupBox.Controls[0].Dispose();
       detailsGroupBox.Controls.Clear();
       detailsGroupBox.Enabled = false;
-      if(agentTreeView.SelectedNode != null) {
-        IViewable viewable = (IViewable)agentTreeView.SelectedNode.Tag;
+      if(dataSetsTreeView.SelectedNode != null) {
+        IViewable viewable = (IViewable)dataSetsTreeView.SelectedNode.Tag;
         Control control = (Control)viewable.CreateView();
         detailsGroupBox.Controls.Add(control);

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/DataSetListView.resx

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