Changeset 1227

Timestamp:

02/25/09 11:50:52 (16 years ago)

Author:

gkronber

Message:

merged fix for #472 (Export of HL3 function trees to HL2 import format (copy-to-clipboard) doesn't work) r1226 from CEDMA refactoring branch to trunk.

Location:

trunk/sources

Files:

• HeuristicLab.GP.StructureIdentification/ModelAnalyzerExporter.cs (modified) (1 diff)
• HeuristicLab.GP/FunctionView.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/ModelAnalyzerExporter.cs

@@ -48 +48 @@
     public string Export(IFunctionTree tree) {
       string result = ExportFunction(tree.Function, tree);
-      result += "(\n";
+      if(tree.SubTrees.Count>0) 
+        result += "(\n";
       foreach(IFunctionTree subTree in tree.SubTrees) {
         result += Export(subTree);

trunk/sources/HeuristicLab.GP/FunctionView.cs

@@ -51 +51 @@
       representationsMenu.Text = "Tree representation";
       representationsMenu.Name = "Tree representation";
-      foreach(IFunctionTreeNameGenerator generator in allNameGenerators) {
-        MenuItem mi = new MenuItem(generator.Name, 
-          delegate(object source, EventArgs args) {
-            IFunctionTreeNameGenerator g = (IFunctionTreeNameGenerator)((MenuItem)source).Tag;
-            this.nameGenerator = g;
-            foreach(MenuItem otherMenuItem in representationsMenu.MenuItems) otherMenuItem.Checked = false;
-            ((MenuItem)source).Checked = true;
-            UpdateControls();
-          }, Shortcut.None);
-        if(generator is DefaultFunctionTreeNameGenerator) mi.Checked = true;
+      foreach (IFunctionTreeNameGenerator generator in allNameGenerators) {
+        MenuItem mi = new MenuItem(generator.Name, MakeNameGeneratorDelegate(generator), Shortcut.None);
+        if (generator is DefaultFunctionTreeNameGenerator) mi.Checked = true;
         else mi.Checked = false;
         mi.Tag = generator;
@@ -83 +76 @@
       DiscoveryService discoveryService = new DiscoveryService();
       IFunctionTreeExporter[] exporters = discoveryService.GetInstances<IFunctionTreeExporter>();
-      foreach(IFunctionTreeExporter exporter in exporters) {
+      foreach (IFunctionTreeExporter exporter in exporters) {
         string result;
         // register a menu item for the exporter
-        MenuItem item = new MenuItem("Copy to clip-board (" + exporter.Name + ")", 
-          delegate(object source, EventArgs args) {
-            TreeNode node = funTreeView.SelectedNode;
-            if(node == null || node.Tag == null) return;
-            Clipboard.SetText(exporter.Export((IFunctionTree)node.Tag));
-          }, Shortcut.None);
+        MenuItem item = new MenuItem("Copy to clip-board (" + exporter.Name + ")",
+          MakeExporterDelegate(exporter), Shortcut.None);
         // try to export the whole tree 
-        if(exporter.TryExport(functionTree, out result)) {
+        if (exporter.TryExport(functionTree, out result)) {
           // if it worked enable the context-menu item
           item.Enabled = true;
@@ -104 +93 @@
       funTreeView.Nodes.Add(rootNode);
 
-      foreach(IFunctionTree subTree in functionTree.SubTrees) {
+      foreach (IFunctionTree subTree in functionTree.SubTrees) {
         CreateTree(rootNode, subTree);
       }
       funTreeView.ExpandAll();
+    }
+
+    private EventHandler MakeNameGeneratorDelegate(IFunctionTreeNameGenerator generator) {
+      return delegate(object source, EventArgs args) {
+        IFunctionTreeNameGenerator g = (IFunctionTreeNameGenerator)((MenuItem)source).Tag;
+        this.nameGenerator = g;
+        foreach (MenuItem otherMenuItem in representationsMenu.MenuItems) otherMenuItem.Checked = false;
+        ((MenuItem)source).Checked = true;
+        UpdateControls();
+      };
+    }
+
+    private EventHandler MakeExporterDelegate(IFunctionTreeExporter exporter) {
+      return delegate(object source, EventArgs args) {
+        TreeNode node = funTreeView.SelectedNode;
+        if (node == null || node.Tag == null) return;
+        Clipboard.SetText(exporter.Export((IFunctionTree)node.Tag));
+      };
     }
 
@@ -117 +124 @@
       node.ContextMenu = treeNodeContextMenu;
       rootNode.Nodes.Add(node);
-      foreach(IFunctionTree subTree in functionTree.SubTrees) {
+      foreach (IFunctionTree subTree in functionTree.SubTrees) {
         CreateTree(node, subTree);
       }
@@ -127 +134 @@
       templateTextBox.Clear();
       editButton.Enabled = false;
-      if(funTreeView.SelectedNode != null && funTreeView.SelectedNode.Tag != null) {
+      if (funTreeView.SelectedNode != null && funTreeView.SelectedNode.Tag != null) {
         IFunctionTree selectedBranch = (IFunctionTree)funTreeView.SelectedNode.Tag;
         UpdateVariablesList(selectedBranch);
@@ -137 +144 @@
 
     private void UpdateVariablesList(IFunctionTree functionTree) {
-      foreach(IVariable variable in functionTree.LocalVariables) {
+      foreach (IVariable variable in functionTree.LocalVariables) {
         variablesListBox.Items.Add(variable.Name);
       }
@@ -144 +151 @@
     private void variablesListBox_SelectedIndexChanged(object sender, EventArgs e) {
       // in case we had an event-handler registered for a different variable => unregister the event-handler
-      if(selectedVariable != null) {
+      if (selectedVariable != null) {
         selectedVariable.Value.Changed -= new EventHandler(selectedVariable_ValueChanged);
       }
-      if(variablesListBox.SelectedItem != null) {
+      if (variablesListBox.SelectedItem != null) {
         string selectedVariableName = (string)variablesListBox.SelectedItem;
         selectedVariable = selectedBranch.GetLocalVariable(selectedVariableName);
@@ -162 +169 @@
 
     void selectedVariable_ValueChanged(object sender, EventArgs e) {
-      if(funTreeView.SelectedNode != null && funTreeView.SelectedNode.Tag != null) {
+      if (funTreeView.SelectedNode != null && funTreeView.SelectedNode.Tag != null) {
         TreeNode node = funTreeView.SelectedNode;
         node.Text = nameGenerator.GetName(functionTree);
@@ -173 +180 @@
 
     private void funTreeView_MouseUp(object sender, MouseEventArgs e) {
-      if(e.Button == MouseButtons.Right) {
+      if (e.Button == MouseButtons.Right) {
         // Select the clicked node
         funTreeView.SelectedNode = funTreeView.GetNodeAt(e.X, e.Y);