Changeset 3903 for trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.cs

Timestamp:

06/08/10 16:26:35 (14 years ago)

Author:

epitzer

Message:

Incorporate changes suggested by abeham in 842#comment:28 (#842)

• Fix persistence of selected assemblies
• Fix problem with static initialization
• Make parameter values (ActualValue) with parameter object
• show (or hide) parameter namespaces as necessary
• add icons for buttons, assemblies and namespaces
• sort assemblies and namespaces alphabetically
• correctly mark and unmark select assemblies
• put assemblies and namespaces into group boxes

File:

• trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.cs (modified) (10 diffs)

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.cs

@@ -38 +38 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.Operators.Programmable {
@@ -51 +52 @@
     public ProgrammableOperatorView() {
       InitializeComponent();
-    }
-
-    public ProgrammableOperatorView(ProgrammableOperator programmableOperator)
-      : this() {
-      ProgrammableOperator = programmableOperator;
+      namespacesTreeView.ImageList = new ImageList();
+      namespacesTreeView.ImageList.Images.Add(VS2008ImageLibrary.Namespace);
+      assembliesTreeView.ImageList = new ImageList();
+      assembliesTreeView.ImageList.Images.Add(VS2008ImageLibrary.Assembly);
+      assembliesTreeView.ImageList.Images.Add(VS2008ImageLibrary.Module);
     }
 
@@ -78 +79 @@
       } else {
         codeEditor.Prefix = GetGeneratedPrefix();
-        codeEditor.Suffix = @"
-    return null;
+        codeEditor.Suffix = @"    return null;
   }
 }";
         codeEditor.UserCode = ProgrammableOperator.Code;
         if (codeEditor.UserCode == "")
-          codeEditor.UserCode = "\n\n\n";
+          codeEditor.UserCode = "    \n    \n    \n    \n";
         InitializeAssemblyList();
         InitializeNamespacesList();
@@ -92 +92 @@
         codeEditor.ScrollAfterPrefix();
         codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors, "ProgrammableOperator");
-        showCodeButton.Enabled = 
-          ProgrammableOperator.CompilationUnitCode != null && 
+        showCodeButton.Enabled =
+          ProgrammableOperator.CompilationUnitCode != null &&
           ProgrammableOperator.CompilationUnitCode.Length > 0;
         parameterCollectionView.Content = ProgrammableOperator.Parameters;
@@ -186 +186 @@
         var node = assembliesTreeView.Nodes.Add(p.Key);
         node.Tag = p;
+        node.ImageIndex = 1;
         foreach (var a in p.Value) {
           var aNode = node.Nodes.Add(a.GetName().Name);
           aNode.Tag = a;
+          aNode.ImageIndex = 0;
           if (selectedAssemblies.Contains(a))
             aNode.Checked = true;
@@ -194 +196 @@
         if (node.Nodes.Count == 1 && node.Nodes[0].Name == node.Nodes[0].Name) {
           node.Tag = node.Nodes[0].Tag;
+          node.ImageIndex = node.Nodes[0].ImageIndex;
+          node.Checked = node.Nodes[0].Checked;
           node.Nodes.Clear();
         } else if (node.Nodes.Count > 0 && node.Nodes.Cast<TreeNode>().All(n => n.Checked)) {
@@ -199 +203 @@
         }
       }
+      assembliesTreeView.Sort();
       assembliesTreeView.EndUpdate();
       assembliesTreeView.Enabled = true;
@@ -216 +221 @@
         AddNamespace(namespacesTreeView.Nodes, ns, selectedNamespaces.Contains(ns), oldTree);
       codeEditor.Prefix = GetGeneratedPrefix();
+      namespacesTreeView.Sort();
       namespacesTreeView.EndUpdate();
       namespacesTreeView.Enabled = true;
@@ -225 +231 @@
         TreeNode newNode = root.Nodes.Add(n.Text, n.Text);
         newNode.Checked = n.Checked;
+        newNode.ImageIndex = n.ImageIndex;
         CloneTreeNodeCollection(newNode, n.Nodes);
         if (n.IsExpanded)
@@ -246 +253 @@
       if (isNew || oldNode != null && oldNode.IsExpanded)
         node.Expand();
-      if (isNew)
+      if (isNew) {
         namespacesTreeView.SelectedNode = node;
+        node.ImageIndex = 0;
+      } else {
+        node.ImageIndex = oldNode.ImageIndex;
+      }
       return isNew;
     }