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

Timestamp:

04/17/10 23:50:05 (14 years ago)

Author:

mkommend

Message:

completly refactored the graph visualization (ticket #867)

Location:

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

Files:

• . (added)
• OperatorShapeInfo.cs (copied) (copied from trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/Model/OperatorShapeInfo.cs) (5 diffs)

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

@@ -29 +29 @@
 using System.Windows.Forms;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   [StorableClass]
   internal class OperatorShapeInfo : ShapeInfo, IOperatorShapeInfo {
-    [Storable]
-    private List<string> connectorNames;
     [Storable]
     private List<string> labels;
@@ -57 +56 @@
 
     public void AddConnector(string connectorName) {
-      if (!this.connectorNames.Contains(connectorName) && connectorName != "Successor") {
+      if (!this.connectorNames.Contains(connectorName)) {
         this.connectorNames.Add(connectorName);
         this.OnChanged();
@@ -73 +72 @@
       this.labels = new List<string>(labels);
       this.OnChanged();
+    }
+
+    [Storable]
+    private List<string> connectorNames;
+    public override IEnumerable<string> Connectors {
+      get { return this.connectorNames; }
     }
 
@@ -163 +168 @@
     public override void UpdateShape(IShape shape) {
       base.UpdateShape(shape);
-      OperatorShape operatorShape = shape as OperatorShape;
-      if (operatorShape != null) {
-        operatorShape.Title = this.Title;
-        operatorShape.Color = this.Color;
-        operatorShape.LineColor = this.LineColor;
-        operatorShape.LineWidth = this.LineWidth;
-        operatorShape.Icon = this.Icon;
-        operatorShape.Collapsed = this.Collapsed;
-
-        int i = 0;
-        int j = 0;
-        //remove old connectors and skip correct connectors
-        List<string> oldConnectorNames = operatorShape.AdditionalConnectorNames.ToList();
-        while (i < this.connectorNames.Count && j < oldConnectorNames.Count) {
-          if (this.connectorNames[i] != oldConnectorNames[j]) {
-            operatorShape.RemoveConnector(oldConnectorNames[j]);
-          } else
-            i++;
-          j++;
-        }
-        //remove remaining old connectors
-        for (; j < oldConnectorNames.Count; j++)
+      OperatorShape operatorShape = (OperatorShape)shape;
+      operatorShape.Title = this.Title;
+      operatorShape.Color = this.Color;
+      operatorShape.LineColor = this.LineColor;
+      operatorShape.LineWidth = this.LineWidth;
+      operatorShape.Icon = this.Icon;
+      operatorShape.Collapsed = this.Collapsed;
+
+      int i = 0;
+      int j = 0;
+      //remove old connectors and skip correct connectors
+      List<string> oldConnectorNames = operatorShape.AdditionalConnectorNames.ToList();
+      while (i < this.connectorNames.Count && j < oldConnectorNames.Count) {
+        if (this.connectorNames[i] != oldConnectorNames[j]) {
           operatorShape.RemoveConnector(oldConnectorNames[j]);
-
-        //add new connectors
-        for (; i < this.connectorNames.Count; i++)
-          operatorShape.AddConnector(this.connectorNames[i]);
-
-        operatorShape.UpdateLabels(this.labels);
-      }
+        } else
+          i++;
+        j++;
+      }
+      //remove remaining old connectors
+      for (; j < oldConnectorNames.Count; j++)
+        operatorShape.RemoveConnector(oldConnectorNames[j]);
+
+      //add new connectors
+      for (; i < this.connectorNames.Count; i++)
+        operatorShape.AddConnector(this.connectorNames[i]);
+
+      operatorShape.UpdateLabels(this.labels);
+    }
+
+    public override void UpdateShapeInfo(IShape shape) {
+      base.UpdateShapeInfo(shape);
+      OperatorShape operatorShape = (OperatorShape)shape;
+      this.Title = operatorShape.Title;
+      this.Color = operatorShape.Color;
+      this.LineColor = operatorShape.LineColor;
+      this.LineWidth = operatorShape.LineWidth;
+      this.Icon = operatorShape.Icon;
+      this.Collapsed = operatorShape.Collapsed;
+
+      //TODO update Connector and labels;
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      OperatorShapeInfo clone = (OperatorShapeInfo) base.Clone(cloner);
+      OperatorShapeInfo clone = (OperatorShapeInfo)base.Clone(cloner);
       clone.collapsed = this.collapsed;
       clone.color = this.color;
@@ -202 +218 @@
       clone.lineWidth = this.lineWidth;
       clone.title = this.title;
-      clone.icon = (Bitmap) this.icon.Clone();
+      clone.icon = (Bitmap)this.icon.Clone();
 
       clone.connectorNames = new List<string>(this.connectorNames);