Changeset 2756 for trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs

Timestamp:

02/05/10 05:23:56 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs (modified) (15 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs

@@ -38 +38 @@
   [Content(typeof(IOperator), false)]
   public sealed partial class OperatorTreeView : ItemView {
-    private Dictionary<IOperatorParameter, List<TreeNode>> operatorParameterNodeTable;
+    private Dictionary<IValueParameter<IOperator>, List<TreeNode>> opParamNodeTable;
     private Dictionary<IOperator, List<TreeNode>> operatorNodeTable;
     private Dictionary<IObservableKeyedCollection<string, IParameter>, IOperator> parametersOperatorTable;
@@ -58 +58 @@
       InitializeComponent();
       graphTreeView.Sorted = true;
-      operatorParameterNodeTable = new Dictionary<IOperatorParameter, List<TreeNode>>();
+      opParamNodeTable = new Dictionary<IValueParameter<IOperator>, List<TreeNode>>();
       operatorNodeTable = new Dictionary<IOperator, List<TreeNode>>();
       parametersOperatorTable = new Dictionary<IObservableKeyedCollection<string, IParameter>, IOperator>();
@@ -94 +94 @@
 
     #region TreeNode Management
-    private TreeNode CreateTreeNode(IOperatorParameter operatorParameter) {
+    private TreeNode CreateTreeNode(IValueParameter<IOperator> opParam) {
       TreeNode node = new TreeNode();
-      node.Text = operatorParameter.Name + ": ";
-      SetOperatorParameterTag(node, operatorParameter);
-
-      if (!operatorParameterNodeTable.ContainsKey(operatorParameter)) {
-        operatorParameterNodeTable.Add(operatorParameter, new List<TreeNode>());
-        operatorParameter.ValueChanged += new EventHandler(operatorParameter_ValueChanged);
-      }
-      operatorParameterNodeTable[operatorParameter].Add(node);
-
-      IOperator op = operatorParameter.Value;
+      node.Text = opParam.Name + ": ";
+      SetOperatorParameterTag(node, opParam);
+
+      if (!opParamNodeTable.ContainsKey(opParam)) {
+        opParamNodeTable.Add(opParam, new List<TreeNode>());
+        opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
+      }
+      opParamNodeTable[opParam].Add(node);
+
+      IOperator op = opParam.Value;
       if (op == null)
         node.Text += "-";
@@ -139 +139 @@
 
       foreach (IParameter param in op.Parameters) {
-        if (param is IOperatorParameter)
+        if (param is IValueParameter<IOperator>)
           node.Nodes.Add(new TreeNode());
       }
@@ -167 +167 @@
       ClearTreeNode(node);
 
-      IOperatorParameter opParam = GetOperatorParameterTag(node);
+      IValueParameter<IOperator> opParam = GetOperatorParameterTag(node);
       if (opParam != null) {
-        operatorParameterNodeTable[opParam].Remove(node);
-        if (operatorParameterNodeTable[opParam].Count == 0) {
-          opParam.ValueChanged -= new EventHandler(operatorParameter_ValueChanged);
-          operatorParameterNodeTable.Remove(opParam);
+        opParamNodeTable[opParam].Remove(node);
+        if (opParamNodeTable[opParam].Count == 0) {
+          opParam.ValueChanged -= new EventHandler(opParam_ValueChanged);
+          opParamNodeTable.Remove(opParam);
         }
       }
@@ -180 +180 @@
     private void AddParameterNodes(IOperator op, IEnumerable<IParameter> parameters) {
       foreach (IParameter param in parameters) {
-        IOperatorParameter opParam = param as IOperatorParameter;
+        IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
         if (opParam != null) {
           foreach (TreeNode node in operatorNodeTable[op])
@@ -189 +189 @@
     private void RemoveParameterNodes(IEnumerable<IParameter> parameters) {
       foreach (IParameter param in parameters) {
-        IOperatorParameter opParam = param as IOperatorParameter;
+        IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
         if (opParam != null) {
-          while (operatorParameterNodeTable.ContainsKey(opParam))
-            RemoveTreeNode(operatorParameterNodeTable[opParam][0]);
+          while (opParamNodeTable.ContainsKey(opParam))
+            RemoveTreeNode(opParamNodeTable[opParam][0]);
         }
       }
@@ -199 +199 @@
 
     #region Parameter and Operator Events
-    private void operatorParameter_ValueChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(operatorParameter_ValueChanged), sender, e);
-      else {
-        IOperatorParameter opParam = (IOperatorParameter)sender;
-        foreach (TreeNode node in operatorParameterNodeTable[opParam].ToArray())
+    private void opParam_ValueChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(opParam_ValueChanged), sender, e);
+      else {
+        IValueParameter<IOperator> opParam = (IValueParameter<IOperator>)sender;
+        foreach (TreeNode node in opParamNodeTable[opParam].ToArray())
           ClearTreeNode(node);
-        foreach (TreeNode node in operatorParameterNodeTable[opParam]) {
+        foreach (TreeNode node in opParamNodeTable[opParam]) {
           node.Text = opParam.Name + ": ";
           if (opParam.Value == null)
@@ -221 +221 @@
         IOperator op = (IOperator)sender;
         foreach (TreeNode node in operatorNodeTable[op]) {
-          IOperatorParameter opParam = GetOperatorParameterTag(node);
+          IValueParameter<IOperator> opParam = GetOperatorParameterTag(node);
           if (opParam == null)
             node.Text = op.Name + " (" + op.ItemName + ")";
@@ -287 +287 @@
         IOperator op = GetOperatorTag(node);
         foreach (IParameter param in op.Parameters) {
-          IOperatorParameter opParam = param as IOperatorParameter;
+          IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
           if (opParam != null) node.Nodes.Add(CreateTreeNode(opParam));
         }
@@ -299 +299 @@
     private void graphTreeView_KeyDown(object sender, KeyEventArgs e) {
       if ((e.KeyCode == Keys.Delete) && (graphTreeView.SelectedNode != null)) {
-        IOperatorParameter opParam = GetOperatorParameterTag(graphTreeView.SelectedNode);
+        IValueParameter<IOperator> opParam = GetOperatorParameterTag(graphTreeView.SelectedNode);
         if (opParam != null) opParam.Value = null;
       }
@@ -324 +324 @@
     private void graphTreeView_ItemDrag(object sender, ItemDragEventArgs e) {
       TreeNode node = (TreeNode)e.Item;
-      IOperatorParameter opParam = GetOperatorParameterTag(node);
+      IValueParameter<IOperator> opParam = GetOperatorParameterTag(node);
       IOperator op = GetOperatorTag(node);
       DataObject data = new DataObject();
@@ -357 +357 @@
         if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) op = (IOperator)op.Clone();
         TreeNode node = graphTreeView.GetNodeAt(graphTreeView.PointToClient(new Point(e.X, e.Y)));
-        IOperatorParameter opParam = GetOperatorParameterTag(node);
+        IValueParameter<IOperator> opParam = GetOperatorParameterTag(node);
         opParam.Value = op;
       }
@@ -389 +389 @@
     }
 
-    private IOperatorParameter GetOperatorParameterTag(TreeNode node) {
+    private IValueParameter<IOperator> GetOperatorParameterTag(TreeNode node) {
       if (node.Tag != null)
-        return ((Tuple<IOperatorParameter, IOperator>)node.Tag).Item1;
+        return ((Tuple<IValueParameter<IOperator>, IOperator>)node.Tag).Item1;
       else
         return null;
     }
-    private void SetOperatorParameterTag(TreeNode node, IOperatorParameter operatorParameter) {
+    private void SetOperatorParameterTag(TreeNode node, IValueParameter<IOperator> opParam) {
       if (node.Tag == null)
-        node.Tag = new Tuple<IOperatorParameter, IOperator>(operatorParameter, null);
-      else
-        ((Tuple<IOperatorParameter, IOperator>)node.Tag).Item1 = operatorParameter;
+        node.Tag = new Tuple<IValueParameter<IOperator>, IOperator>(opParam, null);
+      else
+        ((Tuple<IValueParameter<IOperator>, IOperator>)node.Tag).Item1 = opParam;
     }
     private IOperator GetOperatorTag(TreeNode node) {
       if (node.Tag != null)
-        return ((Tuple<IOperatorParameter, IOperator>)node.Tag).Item2;
+        return ((Tuple<IValueParameter<IOperator>, IOperator>)node.Tag).Item2;
       else
         return null;
@@ -409 +409 @@
     private void SetOperatorTag(TreeNode node, IOperator op) {
       if (node.Tag == null)
-        node.Tag = new Tuple<IOperatorParameter, IOperator>(null, op);
-      else
-        ((Tuple<IOperatorParameter, IOperator>)node.Tag).Item2 = op;
+        node.Tag = new Tuple<IValueParameter<IOperator>, IOperator>(null, op);
+      else
+        ((Tuple<IValueParameter<IOperator>, IOperator>)node.Tag).Item2 = op;
     }
     #endregion