Changeset 3422

Timestamp:

04/19/10 22:07:24 (15 years ago)

Author:

mkommend

Message:

• corrected bugs in operator graph visualization (ticket #867)
• changed multi call operators in graph visualization (ticket #979)

Location:

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization

Files:

• OperatorGraphVisualizationInfo.cs (modified) (10 diffs)
• OperatorShape.cs (modified) (1 diff)
• OperatorShapeInfo.cs (modified) (2 diffs)
• OperatorShapeInfoFactory.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs

@@ -81 +81 @@
       foreach (IOperator oper in this.operatorShapeInfoMapping.FirstValues) {
         foreach (IParameter param in oper.Parameters) {
+          IValueParameter opParam = param as IValueParameter;
           this.parameterOperatorMapping.Add(param, oper);
-          IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
-          if (opParam != null)
+          if (opParam != null && typeof(IOperator).IsAssignableFrom(param.DataType))
             this.RegisterOperatorParameterEvents(opParam);
           else
@@ -125 +125 @@
         foreach (IParameter param in oper.Parameters) {
           clone.parameterOperatorMapping.Add(param, oper);
-          IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
-          if (opParam != null)
+          IValueParameter opParam = param as IValueParameter;
+          if (opParam != null && typeof(IOperator).IsAssignableFrom(param.DataType)) 
             clone.RegisterOperatorParameterEvents(opParam);
           else
@@ -230 +230 @@
       IOperatorShapeInfo shapeInfo = (IOperatorShapeInfo)connectionInfo.From;
       IOperator op = this.operatorShapeInfoMapping.GetBySecond(shapeInfo);
-      IValueParameter<IOperator> param = (IValueParameter<IOperator>)op.Parameters[connectionInfo.ConnectorFrom];
+      IValueParameter param = (IValueParameter)op.Parameters[connectionInfo.ConnectorFrom];
       param.Value = null;
+    }
+
+    public override void AddConnectionInfo(IConnectionInfo connectionInfo) {
+      IOperatorShapeInfo shapeInfo = (IOperatorShapeInfo)connectionInfo.From;
+      IOperator op = this.operatorShapeInfoMapping.GetBySecond(shapeInfo);
+      IValueParameter param = (IValueParameter)op.Parameters.Where(p => p.Name == connectionInfo.ConnectorFrom).Single();
+      IOperatorShapeInfo shapeInfoTo = (IOperatorShapeInfo)connectionInfo.To;
+      IOperator opTo = this.operatorShapeInfoMapping.GetBySecond(shapeInfoTo);
+      param.Value = opTo;
     }
     #endregion
@@ -321 +330 @@
     private void AddParameter(IOperator op, IParameter param) {
       this.parameterOperatorMapping.Add(param, op);
-      IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
-      if (opParam != null) {
+      IValueParameter opParam = param as IValueParameter;
+      if (opParam != null && typeof(IOperator).IsAssignableFrom(param.DataType)) {
         this.RegisterOperatorParameterEvents(opParam);
         IOperatorShapeInfo shapeInfoFrom = this.operatorShapeInfoMapping.GetByFirst(op);
@@ -328 +337 @@
 
         if (opParam.Value != null) {
-          if (!this.operatorShapeInfoMapping.ContainsFirst(opParam.Value))
-            this.AddOperator(opParam.Value);
-          IOperatorShapeInfo shapeInfoTo = this.operatorShapeInfoMapping.GetByFirst(opParam.Value);
+          if (!this.operatorShapeInfoMapping.ContainsFirst((IOperator)opParam.Value))
+            this.AddOperator((IOperator)opParam.Value);
+          IOperatorShapeInfo shapeInfoTo = this.operatorShapeInfoMapping.GetByFirst((IOperator)opParam.Value);
           this.connectionInfos.Add(new ConnectionInfo(shapeInfoFrom, param.Name, shapeInfoTo, OperatorShapeInfoFactory.PredecessorConnector));
         }
@@ -338 +347 @@
 
     private void RemoveParameter(IOperator op, IParameter param) {
-      IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
-      if (opParam != null) {
+      IValueParameter opParam = param as IValueParameter;
+      if (opParam != null && typeof(IOperator).IsAssignableFrom(param.DataType)) {
         this.DeregisterOperatorParameterEvents(opParam);
         IOperatorShapeInfo shapeInfo = this.operatorShapeInfoMapping.GetByFirst(op);
@@ -352 +361 @@
 
     private void opParam_ValueChanged(object sender, EventArgs e) {
-      IValueParameter<IOperator> opParam = (IValueParameter<IOperator>)sender;
+      IValueParameter opParam = (IValueParameter)sender;
       IOperator op = this.parameterOperatorMapping[opParam];
       IOperatorShapeInfo shapeInfoFrom = this.operatorShapeInfoMapping.GetByFirst(op);
@@ -359 +368 @@
       this.connectionInfos.RemoveWhere(c => c.From == shapeInfoFrom && c.ConnectorFrom == opParam.Name);
       if (opParam.Value != null) {
-        if (!this.operatorShapeInfoMapping.ContainsFirst(opParam.Value))
-          this.AddOperator(opParam.Value);
-        IShapeInfo shapeInfoTo = this.operatorShapeInfoMapping.GetByFirst(opParam.Value);
-        this.AddConnectionInfo(new ConnectionInfo(shapeInfoFrom, opParam.Name, shapeInfoTo, OperatorShapeInfoFactory.PredecessorConnector));
+        if (!this.operatorShapeInfoMapping.ContainsFirst((IOperator)opParam.Value))
+          this.AddOperator((IOperator)opParam.Value);
+        IOperatorShapeInfo shapeInfoTo = this.operatorShapeInfoMapping.GetByFirst((IOperator)opParam.Value);
+        base.AddConnectionInfo(new ConnectionInfo(shapeInfoFrom, opParam.Name, shapeInfoTo, OperatorShapeInfoFactory.PredecessorConnector));
       }
     }
@@ -399 +408 @@
     }
 
-    private void RegisterOperatorParameterEvents(IValueParameter<IOperator> opParam) {
+    private void RegisterOperatorParameterEvents(IValueParameter opParam) {
       opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
     }
-    private void DeregisterOperatorParameterEvents(IValueParameter<IOperator> opParam) {
+    private void DeregisterOperatorParameterEvents(IValueParameter opParam) {
       opParam.ValueChanged -= new EventHandler(opParam_ValueChanged);
     }
@@ -426 +435 @@
 
     private void UpdateParameterLabels(IOperator op) {
-      IEnumerable<IParameter> parameters = op.Parameters.Where(p => !(p is IValueParameter<IOperator>));
+      IEnumerable<IParameter> parameters = op.Parameters.Where(p => !(p is IValueParameter && typeof(IOperator).IsAssignableFrom(p.DataType)));
       IOperatorShapeInfo operatorShapeInfo = this.operatorShapeInfoMapping.GetByFirst(op);
       if (parameters.Count() > 0)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShape.cs

@@ -206 +206 @@
       this.Children.Add(expandIconMaterial);
 
-      this.predecessor = this.CreateConnector("Predecessor", new Point(Rectangle.Left, Center.Y));
+      this.predecessor = this.CreateConnector(OperatorShapeInfoFactory.PredecessorConnector, new Point(Rectangle.Left, Center.Y));
       this.Connectors.Add(predecessor);
 
-      this.successor = this.CreateConnector("Successor", (new Point(Rectangle.Right, Center.Y)));
+      this.successor = this.CreateConnector(OperatorShapeInfoFactory.SuccessorConnector, (new Point(Rectangle.Right, Center.Y)));
       this.Connectors.Add(successor);
     }

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs

@@ -160 +160 @@
       shape.Collapsed = this.Collapsed;
       foreach (string connectorName in this.connectorNames)
-        shape.AddConnector(connectorName);
+        if (connectorName != OperatorShapeInfoFactory.SuccessorConnector && connectorName != OperatorShapeInfoFactory.PredecessorConnector)
+          shape.AddConnector(connectorName);
 
       shape.UpdateLabels(this.labels);
@@ -191 +192 @@
         operatorShape.RemoveConnector(oldConnectorNames[j]);
 
-      //add new connectors
+      //add new connectors except successor and connector
       for (; i < this.connectorNames.Count; i++)
+        if (this.connectorNames[i] != OperatorShapeInfoFactory.SuccessorConnector && this.connectorNames[i] != OperatorShapeInfoFactory.PredecessorConnector)
         operatorShape.AddConnector(this.connectorNames[i]);
 

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfoFactory.cs

@@ -32 +32 @@
   internal static class OperatorShapeInfoFactory {
     public const string PredecessorConnector = "Predecessor";
+    public const string SuccessorConnector = "Successor";
     public static IOperatorShapeInfo CreateOperatorShapeInfo(IOperator op) {
-      IEnumerable<string> operatorParameterNames = op.Parameters.Where(p => p is IValueParameter<IOperator>).Select(p => p.Name);
-      IEnumerable<string> paramaterNameValues = op.Parameters.Where(p => !(p is IValueParameter<IOperator>)).Select(p => p.ToString());
+      IEnumerable<string> operatorParameterNames = op.Parameters.Where(p => p is IValueParameter && typeof(IOperator).IsAssignableFrom(p.DataType)).Select(p => p.Name);
+      IEnumerable<string> paramaterNameValues = op.Parameters.Where(p => !(p is IValueParameter && typeof(IOperator).IsAssignableFrom(p.DataType))).Select(p => p.ToString());
 
       OperatorShapeInfo operatorShapeInfo = new OperatorShapeInfo(operatorParameterNames, paramaterNameValues);