Changeset 4841

Timestamp:

11/18/10 21:01:20 (14 years ago)

Author:

swinkler

Message:

Simplified management of formatters in view for display of symbolic expression trees as strings. (#1270)

File:

• branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionView.cs (modified) (4 diffs)

branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionView.cs

@@ -30 +30 @@
   [Content(typeof(SymbolicExpressionTree), false)]
   public partial class SymbolicExpressionView : AsynchronousContentView {
-    private ISymbolicExpressionTreeStringFormatter treeFormatter;
+
     List<ISymbolicExpressionTreeStringFormatter> treeFormattersList = new List<ISymbolicExpressionTreeStringFormatter>();
 
@@ -47 +47 @@
         if (formatters.Current is SymbolicExpressionTreeStringFormatter)
           selectedIndex = treeFormattersList.Count;
-        treeFormattersList.Add(formatters.Current.Clone() as ISymbolicExpressionTreeStringFormatter);
-        formattersComboBox.Items.Add(treeFormattersList[treeFormattersList.Count - 1].Name);
+        ISymbolicExpressionTreeStringFormatter formatter = formatters.Current.Clone() as ISymbolicExpressionTreeStringFormatter;
+        treeFormattersList.Add(formatter);
+        formattersComboBox.Items.Add(formatter.Name);
         formatters.MoveNext();
       }
       formattersComboBox.SelectedIndex = selectedIndex;
-      //treeFormatter = new SymbolicExpressionTreeStringFormatter();
     }
 
@@ -60 +60 @@
         textBox.Text = string.Empty;
       else
-        textBox.Text = treeFormatter.Format(Content);
+        textBox.Text = treeFormattersList[formattersComboBox.SelectedIndex].Format(Content);
     }
 
@@ -70 +70 @@
 
     private void formattersComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
-      treeFormatter = treeFormattersList[formattersComboBox.SelectedIndex];
       OnContentChanged();
     }