Changeset 3514 for trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfoView.cs

Timestamp:

04/23/10 14:28:32 (14 years ago)

Author:

mkommend

Message:

implemented application review comments from abeham (ticket #867)

File:

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

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfoView.cs

@@ -42 +42 @@
   [View("GraphVisualizationInfo View")]
   [Content(typeof(IGraphVisualizationInfo), true)]
-  public partial class GraphVisualizationInfoView : ContentView {
+  public partial class GraphVisualizationInfoView : AsynchronousContentView {
     private BidirectionalLookup<IShapeInfo, IShape> shapeInfoShapeMapping;
     private BidirectionalLookup<IConnectionInfo, IConnection> connectionInfoConnectionMapping;
@@ -78 +78 @@
       this.SetEnabledStateOfControls();
     }
+    protected override void OnLockedChanged() {
+      base.OnLockedChanged();
+      this.SetEnabledStateOfControls();
+    }
     private void SetEnabledStateOfControls() {
       DeleteTool deleteTool = (DeleteTool)this.Controller.Tools.Where(t => t.Name == ControllerBase.DeleteToolName).FirstOrDefault();
@@ -84 +88 @@
         controller.RemoveTool(deleteTool);
       else {
-        if (ReadOnly && deleteTool != null && controller != null)
+        if ((ReadOnly || Locked) && deleteTool != null && controller != null)
           controller.RemoveTool(deleteTool);
-        else if (!ReadOnly && deleteTool == null)
+        else if ((!ReadOnly && !Locked) && deleteTool == null)
           this.Controller.AddTool(new DeleteTool(ControllerBase.DeleteToolName));
       }
@@ -171 +175 @@
     }
     private void RemoveShapeInfo(IShapeInfo shapeInfo) {
-        this.DeregisterShapeInfoEvents(shapeInfo);
-        IShape shape = this.shapeInfoShapeMapping.GetByFirst(shapeInfo);
-        this.DeregisterShapeEvents(shape);
-        this.shapeInfoShapeMapping.RemoveByFirst(shapeInfo);
-
-        if (this.graphVisualization.Controller.Model.Shapes.Contains(shape)) {
-          this.graphVisualization.Controller.Model.RemoveShape(shape);
-          this.graphVisualization.Invalidate();
-        }
+      this.DeregisterShapeInfoEvents(shapeInfo);
+      IShape shape = this.shapeInfoShapeMapping.GetByFirst(shapeInfo);
+      this.DeregisterShapeEvents(shape);
+      this.shapeInfoShapeMapping.RemoveByFirst(shapeInfo);
+
+      if (this.graphVisualization.Controller.Model.Shapes.Contains(shape)) {
+        this.graphVisualization.Controller.Model.RemoveShape(shape);
+        this.graphVisualization.Controller.Model.Selection.Clear();
+        this.graphVisualization.Invalidate();
+      }
     }
 
@@ -240 +245 @@
       this.connectionInfoConnectionMapping.RemoveByFirst(connectionInfo);
       this.RemoveConnection(connection);
-      
+
     }
     private void RemoveConnection(IConnection connection) {