Changeset 2868 for trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/Model

Timestamp:

02/25/10 17:28:31 (15 years ago)

Author:

mkommend

Message:

finished mapping from OperatorGraph to GraphVisualizationInfo (ticket #867)

Location:

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

Files:

• IShapeInfo.cs (modified) (1 diff)
• OperatorGraphVisualizationInfo.cs (modified) (8 diffs)
• OperatorShape.cs (modified) (4 diffs)
• OperatorShapeInfo.cs (modified) (2 diffs)
• ShapeInfo.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/Model/IShapeInfo.cs

@@ -38 +38 @@
     void RemoveConnector(string connectorName);
 
-    IEnumerable<KeyValuePair<string,IShapeInfo>> Connections {get;}
-    INotifyObservableDictionaryItemsChanged<string, IShapeInfo> ObservableConnections { get; }
-
-    void AddConnection(string fromConnectorName, IShapeInfo toShapeInfo);
-    void RemoveConnection(string fromConnectorName);
-    void ChangeConnection(string fromConnector, IShapeInfo toShapeInfo);
-
     IShape CreateShape();
     void UpdateShape(IShape shape);

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

@@ -41 +41 @@
 
       this.shapeInfos = new ObservableSet<IShapeInfo>();
+      this.connections = new ObservableDictionary<KeyValuePair<IShapeInfo, string>, IShapeInfo>();
     }
 
@@ -48 +49 @@
       this.operatorGraph.InitialOperatorChanged += new EventHandler(operatorGraph_InitialOperatorChanged);
       foreach (IOperator op in operatorGraph.Operators)
-        this.AddOperator(op);
+        if (!this.shapeInfoMapping.ContainsFirst(op))
+          this.AddOperator(op);
 
       operatorGraph.Operators.ItemsAdded += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IOperator>(Operators_ItemsAdded);
@@ -83 +85 @@
     }
 
+    private ObservableDictionary<KeyValuePair<IShapeInfo, string>, IShapeInfo> connections;
+    public INotifyObservableDictionaryItemsChanged<KeyValuePair<IShapeInfo, string>, IShapeInfo> ObservableConnections {
+      get { return this.connections; }
+    }
+    public IEnumerable<KeyValuePair<KeyValuePair<IShapeInfo, string>, IShapeInfo>> Connections {
+      get { return this.connections; }
+    }
+
+    #region methods to manipulate operatorgraph by the shape info
     internal void AddShapeInfo(IOperator op, IShapeInfo shapeInfo) {
       this.RegisterOperatorEvents(op);
@@ -89 +100 @@
       this.shapeInfos.Add(shapeInfo);
 
+      foreach (IParameter param in op.Parameters)
+        this.AddParameter(op, param);
+
       this.operatorGraph.Operators.Add(op);
     }
@@ -97 +111 @@
     }
 
+    internal void AddConnection(IShapeInfo shapeInfoFrom, string connectorName, IShapeInfo shapeInfoTo) {
+      IOperator opFrom = this.shapeInfoMapping.GetBySecond(shapeInfoFrom);
+      IOperator opTo = this.shapeInfoMapping.GetBySecond(shapeInfoTo);
+
+      IValueParameter<IOperator> param = (IValueParameter<IOperator>)opFrom.Parameters[connectorName];
+      param.Value = opTo;
+    }
+
+    internal void ChangeConnection(IShapeInfo shapeInfoFrom, string connectorName, IShapeInfo shapeInfoTo) {
+      IOperator opFrom = this.shapeInfoMapping.GetBySecond(shapeInfoFrom);
+      IOperator opTo = this.shapeInfoMapping.GetBySecond(shapeInfoTo);
+
+      IValueParameter<IOperator> param = (IValueParameter<IOperator>)opFrom.Parameters[connectorName];
+      param.Value = opTo;
+    }
+
+    internal void RemoveConnection(IShapeInfo shapeInfoFrom, string connectorName) {
+      IOperator opFrom = this.shapeInfoMapping.GetBySecond(shapeInfoFrom);
+      IValueParameter<IOperator> param = (IValueParameter<IOperator>)opFrom.Parameters[connectorName];
+      param.Value = null;
+    }
+    #endregion
+
     #region operator events
     private void AddOperator(IOperator op) {
-      if (shapeInfoMapping.ContainsFirst(op))
-        return;
-
-      this.RegisterOperatorEvents(op);
-      IShapeInfo shapeInfo = Factory.CreateShapeInfo(op);
-      this.operatorParameterCollectionMapping.Add(op, op.Parameters);
-      this.shapeInfoMapping.Add(op, shapeInfo);
-      foreach (IParameter param in op.Parameters)
-        this.AddParameter(op, param);
-
-      this.shapeInfos.Add(shapeInfo);
+      if (!this.shapeInfoMapping.ContainsFirst(op)) {
+        this.RegisterOperatorEvents(op);
+        IShapeInfo shapeInfo = Factory.CreateShapeInfo(op);
+        this.operatorParameterCollectionMapping.Add(op, op.Parameters);
+        this.shapeInfoMapping.Add(op, shapeInfo);
+        foreach (IParameter param in op.Parameters)
+          this.AddParameter(op, param);
+
+        this.shapeInfos.Add(shapeInfo);
+      }
     }
 
@@ -166 +202 @@
           if (!this.shapeInfoMapping.ContainsFirst(opParam.Value))
             this.AddOperator(opParam.Value);
-          shapeInfo.AddConnection(param.Name, this.shapeInfoMapping.GetByFirst(opParam.Value));
+          this.connections.Add(new KeyValuePair<IShapeInfo, string>(shapeInfo, param.Name), this.shapeInfoMapping.GetByFirst(opParam.Value));
         }
       }
     }
+
     private void RemoveParameter(IOperator op, IParameter param) {
       IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
@@ -176 +213 @@
         this.parameterOperatorMapping.Remove(opParam);
         IShapeInfo shapeInfo = this.shapeInfoMapping.GetByFirst(op);
+
+        this.connections.Remove(new KeyValuePair<IShapeInfo, string>(shapeInfo, param.Name));
         shapeInfo.RemoveConnector(param.Name);
       }
@@ -185 +224 @@
         IOperator op = this.parameterOperatorMapping[opParam];
         IShapeInfo shapeInfo = this.shapeInfoMapping.GetByFirst(op);
+        KeyValuePair<IShapeInfo, string> connectionFrom = new KeyValuePair<IShapeInfo, string>(shapeInfo, opParam.Name);
 
         if (opParam.Value == null)
-          shapeInfo.RemoveConnection(opParam.Name);
+          this.connections.Remove(connectionFrom);
         else
-          shapeInfo.ChangeConnection(opParam.Name, this.shapeInfoMapping.GetByFirst(opParam.Value));
+          this.connections[connectionFrom] = this.shapeInfoMapping.GetByFirst(opParam.Value);
       }
     }

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

@@ -51 +51 @@
 
     private IConnector CreateConnector(string connectorName, Point location) {
-      Connector connector = new Connector(location);
+      Connector connector = new Connector(location, this.Model);
       connector.ConnectorStyle = ConnectorStyle.Square;
       connector.Parent = this;
@@ -69 +69 @@
 
     public void RemoveConnector(string connectorName) {
-      IConnector connector = this.additionalConnectors.Where(c => c.Name ==connectorName).FirstOrDefault();
+      IConnector connector = this.additionalConnectors.Where(c => c.Name == connectorName).FirstOrDefault();
       if (connector != null) {
         this.additionalConnectors.Remove(connector);
@@ -78 +78 @@
 
     private void UpdateConnectorLocation() {
-      int spacing = this.Rectangle.Width / this.additionalConnectors.Count + 1;
+      if (this.additionalConnectors.Count == 0)
+        return;
+
+      int spacing = this.Rectangle.Width / this.additionalConnectors.Count;
       int margin = spacing / 2;
       int posX = margin + this.Rectangle.X;
@@ -98 +101 @@
       Connectors.Add(predecessor);
 
-      successor = this.CreateConnector("Successor",(new Point(Rectangle.Right, Center.Y)));
+      successor = this.CreateConnector("Successor", (new Point(Rectangle.Right, Center.Y)));
       Connectors.Add(successor);
       #endregion

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

@@ -54 +54 @@
       if (this.connectorNames.Contains(connectorName)) {
         this.connectorNames.Remove(connectorName);
-        if (this.connections.ContainsKey(connectorName))
-          this.connections.Remove(connectorName);
         this.OnChanged();
       }
-    }
-
-    public override void AddConnection(string fromConnectorName, IShapeInfo toShapeInfo) {
-      this.connections.Add(fromConnectorName, toShapeInfo);
-    }
-
-    public override void RemoveConnection(string fromConnectorName) {
-      if (this.connections.ContainsKey(fromConnectorName))
-        this.connections.Remove(fromConnectorName);
-    }
-
-    public override void ChangeConnection(string fromConnectorName, IShapeInfo toShapeInfo) {
-      this.connections[fromConnectorName] = toShapeInfo;
     }
 
@@ -137 +122 @@
         }
         //remove old connectors
-        for (; j < oldConnectorNames.Count; i++)
+        for (; j < oldConnectorNames.Count; j++)
           operatorShape.RemoveConnector(oldConnectorNames[j]);
 

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/Model/ShapeInfo.cs

@@ -35 +35 @@
         throw new ArgumentException("The passed shape type " + shapeType + " must be derived from IShape.");
       this.shapeType = shapeType;
-      this.connections = new ObservableDictionary<string, IShapeInfo>();
     }
 
@@ -65 +64 @@
     }
 
-    protected ObservableDictionary<string, IShapeInfo> connections;
-    public IEnumerable<KeyValuePair<string, IShapeInfo>> Connections {
-      get { return this.connections; }
-    }
-    public INotifyObservableDictionaryItemsChanged<string, IShapeInfo> ObservableConnections {
-      get { return this.connections; }
-    }
-
     public abstract void AddConnector(string connectorName);
     public abstract void RemoveConnector(string connectorName);
-    public abstract void AddConnection(string fromConnectorName, IShapeInfo toShapeInfo);
-    public abstract void RemoveConnection(string fromConnectorName);
-    public abstract void ChangeConnection(string fromConnectorName, IShapeInfo toShapeInfo);
-
 
     public virtual IShape CreateShape() {