Changeset 2701

Timestamp:

01/28/10 16:43:36 (15 years ago)

Author:

gkronber

Message:

Repaired FunctionLibraryEditor. #748 (FunctionLibraryView is empty)

Location:

trunk/sources/HeuristicLab.GP/3.3

Files:

• FunctionLibrary.cs (modified) (3 diffs)
• FunctionLibraryEditor.Designer.cs (modified) (7 diffs)
• FunctionLibraryEditor.cs (modified) (4 diffs)
• FunctionView.Designer.cs (added)
• FunctionView.cs (added)
• FunctionView.resx (added)
• HeuristicLab.GP-3.3.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.GP/3.3/FunctionLibrary.cs

@@ -42 +42 @@
       if (!functions.Contains(fun)) {
         functions.Add(fun);
+        fun.Changed += new EventHandler(fun_Changed);
         OnChanged();
       }
@@ -48 +49 @@
     public void RemoveFunction(IFunction fun) {
       functions.Remove(fun);
+      fun.Changed -= new EventHandler(fun_Changed);
 
       // remove the operator from the allowed sub-functions of all functions
@@ -55 +57 @@
         }
       }
+      OnChanged();
+    }
+
+    void fun_Changed(object sender, EventArgs e) {
       OnChanged();
     }

trunk/sources/HeuristicLab.GP/3.3/FunctionLibraryEditor.Designer.cs

@@ -47 +47 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.functionsTabPage = new System.Windows.Forms.TabPage();
+      this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.availableFunctionsGroupBox = new System.Windows.Forms.GroupBox();
+      this.functionsListView = new System.Windows.Forms.ListView();
+      this.removeButton = new System.Windows.Forms.Button();
+      this.addButton = new System.Windows.Forms.Button();
+      this.functionDetailsGroupBox = new System.Windows.Forms.GroupBox();
+      this.functionDetailsPanel = new System.Windows.Forms.Panel();
+      this.functionsComboBox = new System.Windows.Forms.ComboBox();
       this.initializationTabPage = new System.Windows.Forms.TabPage();
       this.initSplitContainer = new System.Windows.Forms.SplitContainer();
@@ -55 +63 @@
       this.mutationListView = new System.Windows.Forms.ListView();
       this.mutationVariableView = new HeuristicLab.Core.VariableView();
-      this.addButton = new System.Windows.Forms.Button();
-      this.removeButton = new System.Windows.Forms.Button();
-      this.functionsListView = new System.Windows.Forms.ListView();
       this.tabControl.SuspendLayout();
       this.functionsTabPage.SuspendLayout();
+      this.splitContainer.Panel1.SuspendLayout();
+      this.splitContainer.Panel2.SuspendLayout();
+      this.splitContainer.SuspendLayout();
+      this.availableFunctionsGroupBox.SuspendLayout();
+      this.functionDetailsGroupBox.SuspendLayout();
       this.initializationTabPage.SuspendLayout();
       this.initSplitContainer.Panel1.SuspendLayout();
@@ -84 +94 @@
       // functionsTabPage
       // 
-      this.functionsTabPage.Controls.Add(this.functionsListView);
-      this.functionsTabPage.Controls.Add(this.removeButton);
-      this.functionsTabPage.Controls.Add(this.addButton);
+      this.functionsTabPage.Controls.Add(this.splitContainer);
       this.functionsTabPage.Location = new System.Drawing.Point(4, 22);
       this.functionsTabPage.Name = "functionsTabPage";
@@ -94 +102 @@
       this.functionsTabPage.Text = "Functions";
       this.functionsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // splitContainer
+      // 
+      this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer.Location = new System.Drawing.Point(3, 3);
+      this.splitContainer.Name = "splitContainer";
+      // 
+      // splitContainer.Panel1
+      // 
+      this.splitContainer.Panel1.Controls.Add(this.availableFunctionsGroupBox);
+      // 
+      // splitContainer.Panel2
+      // 
+      this.splitContainer.Panel2.Controls.Add(this.functionDetailsGroupBox);
+      this.splitContainer.Size = new System.Drawing.Size(663, 529);
+      this.splitContainer.SplitterDistance = 230;
+      this.splitContainer.TabIndex = 4;
+      // 
+      // availableFunctionsGroupBox
+      // 
+      this.availableFunctionsGroupBox.Controls.Add(this.functionsListView);
+      this.availableFunctionsGroupBox.Controls.Add(this.removeButton);
+      this.availableFunctionsGroupBox.Controls.Add(this.addButton);
+      this.availableFunctionsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.availableFunctionsGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.availableFunctionsGroupBox.Name = "availableFunctionsGroupBox";
+      this.availableFunctionsGroupBox.Size = new System.Drawing.Size(230, 529);
+      this.availableFunctionsGroupBox.TabIndex = 5;
+      this.availableFunctionsGroupBox.TabStop = false;
+      this.availableFunctionsGroupBox.Text = "Available functions:";
+      // 
+      // functionsListView
+      // 
+      this.functionsListView.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.functionsListView.Location = new System.Drawing.Point(6, 19);
+      this.functionsListView.MultiSelect = false;
+      this.functionsListView.Name = "functionsListView";
+      this.functionsListView.Size = new System.Drawing.Size(218, 475);
+      this.functionsListView.TabIndex = 3;
+      this.functionsListView.UseCompatibleStateImageBehavior = false;
+      this.functionsListView.View = System.Windows.Forms.View.List;
+      this.functionsListView.SelectedIndexChanged += new System.EventHandler(this.functionsListView_SelectedIndexChanged);
+      this.functionsListView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.functionsListView_ItemDrag);
+      // 
+      // removeButton
+      // 
+      this.removeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.removeButton.Location = new System.Drawing.Point(87, 500);
+      this.removeButton.Name = "removeButton";
+      this.removeButton.Size = new System.Drawing.Size(75, 23);
+      this.removeButton.TabIndex = 2;
+      this.removeButton.Text = "Remove";
+      this.removeButton.UseVisualStyleBackColor = true;
+      this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
+      // 
+      // addButton
+      // 
+      this.addButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.addButton.Location = new System.Drawing.Point(6, 500);
+      this.addButton.Name = "addButton";
+      this.addButton.Size = new System.Drawing.Size(75, 23);
+      this.addButton.TabIndex = 1;
+      this.addButton.Text = "Add...";
+      this.addButton.UseVisualStyleBackColor = true;
+      this.addButton.Click += new System.EventHandler(this.addButton_Click);
+      // 
+      // functionDetailsGroupBox
+      // 
+      this.functionDetailsGroupBox.Controls.Add(this.functionDetailsPanel);
+      this.functionDetailsGroupBox.Controls.Add(this.functionsComboBox);
+      this.functionDetailsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.functionDetailsGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.functionDetailsGroupBox.Name = "functionDetailsGroupBox";
+      this.functionDetailsGroupBox.Size = new System.Drawing.Size(429, 529);
+      this.functionDetailsGroupBox.TabIndex = 8;
+      this.functionDetailsGroupBox.TabStop = false;
+      this.functionDetailsGroupBox.Text = "Function details:";
+      // 
+      // functionDetailsPanel
+      // 
+      this.functionDetailsPanel.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.functionDetailsPanel.Location = new System.Drawing.Point(6, 46);
+      this.functionDetailsPanel.Name = "functionDetailsPanel";
+      this.functionDetailsPanel.Size = new System.Drawing.Size(417, 477);
+      this.functionDetailsPanel.TabIndex = 7;
+      // 
+      // functionsComboBox
+      // 
+      this.functionsComboBox.FormattingEnabled = true;
+      this.functionsComboBox.Location = new System.Drawing.Point(6, 19);
+      this.functionsComboBox.Name = "functionsComboBox";
+      this.functionsComboBox.Size = new System.Drawing.Size(178, 21);
+      this.functionsComboBox.TabIndex = 0;
+      this.functionsComboBox.SelectedIndexChanged += new System.EventHandler(this.functionsComboBox_SelectedIndexChanged);
       // 
       // initializationTabPage
@@ -194 +300 @@
       this.mutationVariableView.Variable = null;
       // 
-      // addButton
-      // 
-      this.addButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.addButton.Location = new System.Drawing.Point(6, 506);
-      this.addButton.Name = "addButton";
-      this.addButton.Size = new System.Drawing.Size(75, 23);
-      this.addButton.TabIndex = 1;
-      this.addButton.Text = "Add...";
-      this.addButton.UseVisualStyleBackColor = true;
-      this.addButton.Click += new System.EventHandler(this.addButton_Click);
-      // 
-      // removeButton
-      // 
-      this.removeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.removeButton.Location = new System.Drawing.Point(87, 506);
-      this.removeButton.Name = "removeButton";
-      this.removeButton.Size = new System.Drawing.Size(75, 23);
-      this.removeButton.TabIndex = 2;
-      this.removeButton.Text = "Remove";
-      this.removeButton.UseVisualStyleBackColor = true;
-      this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
-      // 
-      // functionsListView
-      // 
-      this.functionsListView.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.functionsListView.Location = new System.Drawing.Point(3, 6);
-      this.functionsListView.Name = "functionsListView";
-      this.functionsListView.Size = new System.Drawing.Size(660, 494);
-      this.functionsListView.TabIndex = 3;
-      this.functionsListView.UseCompatibleStateImageBehavior = false;
-      this.functionsListView.SelectedIndexChanged += new System.EventHandler(this.functionsListView_SelectedIndexChanged);
-      // 
       // FunctionLibraryEditor
       // 
@@ -237 +309 @@
       this.tabControl.ResumeLayout(false);
       this.functionsTabPage.ResumeLayout(false);
+      this.splitContainer.Panel1.ResumeLayout(false);
+      this.splitContainer.Panel2.ResumeLayout(false);
+      this.splitContainer.ResumeLayout(false);
+      this.availableFunctionsGroupBox.ResumeLayout(false);
+      this.functionDetailsGroupBox.ResumeLayout(false);
       this.initializationTabPage.ResumeLayout(false);
       this.initSplitContainer.Panel1.ResumeLayout(false);
@@ -264 +341 @@
     private System.Windows.Forms.Button addButton;
     private System.Windows.Forms.ListView functionsListView;
+    private System.Windows.Forms.SplitContainer splitContainer;
+    private System.Windows.Forms.Panel functionDetailsPanel;
+    private System.Windows.Forms.ComboBox functionsComboBox;
+    private System.Windows.Forms.GroupBox availableFunctionsGroupBox;
+    private System.Windows.Forms.GroupBox functionDetailsGroupBox;
   }
 }

trunk/sources/HeuristicLab.GP/3.3/FunctionLibraryEditor.cs

@@ -48 +48 @@
     protected override void UpdateControls() {
       base.UpdateControls();
+      functionsListView.Clear();
+      functionsComboBox.Items.Clear();
       foreach (IFunction fun in FunctionLibrary.Functions) {
+        functionsListView.Items.Add(CreateListViewItem(fun));
+        functionsComboBox.Items.Add(fun);
         if (fun.Manipulator != null) {
           mutationListView.Items.Add(CreateListViewItem(fun));
@@ -82 +86 @@
       if (chooseFunctionDialog.ShowDialog(this) == DialogResult.OK) {
         FunctionLibrary.AddFunction((IFunction)chooseFunctionDialog.Item);
-        functionsListView.Items.Add(CreateListViewItem((IFunction)chooseFunctionDialog.Item));
-        functionsListView.Sort();
       }
     }
@@ -89 +91 @@
     private void removeButton_Click(object sender, EventArgs e) {
       // delete from the end of the list
-      IEnumerable<int> removeIndices = functionsListView.SelectedIndices.OfType<int>().OrderBy(x => 1.0 / x);
+      List<int> removeIndices = functionsListView.SelectedIndices.OfType<int>().OrderBy(x => 1.0 / x).ToList();
       foreach (int selectedIndex in removeIndices) {
-        FunctionLibrary.RemoveFunction((IFunction)functionsListView.Items[selectedIndex].Tag);
-        functionsListView.Items.RemoveAt(selectedIndex);
+        FunctionLibrary.RemoveFunction((IFunction)functionsListView.Items[selectedIndex].Tag);        
       }
     }
 
     private void functionsListView_SelectedIndexChanged(object sender, EventArgs e) {
-      removeButton.Enabled = functionsListView.SelectedIndices.Count > 0;
+      if (functionsListView.SelectedIndices.Count > 0) {
+        removeButton.Enabled = true;
+      } else {
+        removeButton.Enabled = false;
+      }
     }
 
@@ -107 +112 @@
       return item;
     }
+
+    private void functionsListView_ItemDrag(object sender, ItemDragEventArgs e) {
+      ListViewItem item = (ListViewItem)e.Item;
+      IFunction fun = (IFunction)item.Tag;
+      DataObject data = new DataObject();
+      data.SetData("IFunction", fun);
+      data.SetData("DragSource", functionsListView);
+      DoDragDrop(data, DragDropEffects.Link);
+    }
+
+    private void functionsComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      if (functionsComboBox.SelectedItem != null) {
+        IFunction selectedFun = (IFunction)functionsComboBox.SelectedItem;
+        Control funView = (Control)selectedFun.CreateView();
+        funView.Dock = DockStyle.Fill;
+        functionDetailsPanel.Controls.Clear();
+        functionDetailsPanel.Controls.Add(funView);
+      }
+    }
   }
 }

trunk/sources/HeuristicLab.GP/3.3/HeuristicLab.GP-3.3.csproj

@@ -83 +83 @@
   <ItemGroup>
     <Compile Include="BaseClasses\BinaryFunction.cs" />
+    <Compile Include="BaseClasses\Function.cs" />
     <Compile Include="BaseClasses\FunctionLibraryInjectorBase.cs" />
+    <Compile Include="BaseClasses\FunctionTree.cs" />
     <Compile Include="BaseClasses\TerminalTreeNode.cs" />
-    <Compile Include="BaseClasses\FunctionBase.cs" />
-    <Compile Include="BaseClasses\FunctionTreeBase.cs" />
     <Compile Include="BaseClasses\Terminal.cs" />
     <Compile Include="BaseClasses\UnaryFunction.cs" />
+    <Compile Include="FunctionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="FunctionView.Designer.cs">
+      <DependentUpon>FunctionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="GeneticProgrammingModelView.cs">
       <SubType>UserControl</SubType>
@@ -132 +138 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="FunctionView.resx">
+      <DependentUpon>FunctionView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="GeneticProgrammingModelView.resx">
       <DependentUpon>GeneticProgrammingModelView.cs</DependentUpon>