Changeset 2862

Timestamp:

02/24/10 21:58:16 (14 years ago)

Author:

mkommend

Message:

important bugfix to avoid duplicate shapes in the view (ticket #867)

File:

• trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphView.cs

@@ -87 +87 @@
 
       foreach (IShapeInfo shapeInfo in this.VisualizationInfo.ShapeInfos)
-        this.AddShapeInfo(shapeInfo);
+        if (!this.shapeInfoShapeMapping.ContainsFirst(shapeInfo))
+          this.AddShapeInfo(shapeInfo);
 
       this.UpdateLayoutRoot();
@@ -143 +144 @@
       shape.OnEntityChange += new EventHandler<EntityEventArgs>(shape_OnEntityChange);
       this.shapeInfoShapeMapping.Add(shapeInfo, shape);
+      this.shapeInfoConnectionsMapping.Add(shapeInfo, shapeInfo.ObservableConnections);
 
       foreach (IConnector connector in shape.Connectors)
@@ -169 +171 @@
 
       this.shapeInfoShapeMapping.RemoveByFirst(shapeInfo);
+      this.shapeInfoConnectionsMapping.RemoveByFirst(shapeInfo);
 
       if (this.graphVisualization.Controller.Model.Shapes.Contains(shape)) {
@@ -177 +180 @@
     private void RegisterShapeInfoEvents(IShapeInfo shapeInfo) {
       shapeInfo.Changed += new ChangedEventHandler(shapeInfo_Changed);
-
-      this.shapeInfoConnectionsMapping.Add(shapeInfo, shapeInfo.ObservableConnections);
       shapeInfo.ObservableConnections.ItemsAdded += new CollectionItemsChangedEventHandler<KeyValuePair<string, IShapeInfo>>(Connections_ItemsAdded);
       shapeInfo.ObservableConnections.ItemsRemoved += new CollectionItemsChangedEventHandler<KeyValuePair<string, IShapeInfo>>(Connections_ItemsRemoved);
@@ -187 +188 @@
     private void DeregisterShapeInfoEvents(IShapeInfo shapeInfo) {
       shapeInfo.Changed -= new ChangedEventHandler(shapeInfo_Changed);
-
-      this.shapeInfoConnectionsMapping.RemoveByFirst(shapeInfo);
       shapeInfo.ObservableConnections.ItemsAdded -= new CollectionItemsChangedEventHandler<KeyValuePair<string, IShapeInfo>>(Connections_ItemsAdded);
       shapeInfo.ObservableConnections.ItemsRemoved -= new CollectionItemsChangedEventHandler<KeyValuePair<string, IShapeInfo>>(Connections_ItemsRemoved);