Changeset 13799 for branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization/3.3/Primitives/PortRectangle.cs

Timestamp:

04/26/16 15:05:28 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• improved network visualization

File:

• branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization/3.3/Primitives/PortRectangle.cs (modified) (7 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization/3.3/Primitives/PortRectangle.cs

@@ -35 +35 @@
     protected readonly INodeVisualProperties nodeVisualProperties;
 
+    protected IPortVisualProperties VisualProperties {
+      get { return (IPortVisualProperties)networkItem.VisualProperties; }
+      set {
+        if (networkItem.VisualProperties == value) return;
+        networkItem.VisualProperties = value;
+      }
+    }
     protected bool IgnoreVisualPropertiesChanges { get; set; }
 
@@ -57 +64 @@
     }
 
+    public override Brush Brush {
+      get { return base.Brush; }
+      set {
+        if (base.Brush == value) return;
+        base.Brush = value;
+        SaveVisualProperties();
+      }
+    }
+
+    public override Pen Pen {
+      get { return base.Pen; }
+      set {
+        if (base.Pen == value) return;
+        base.Pen = value;
+        SaveVisualProperties();
+      }
+    }
+
     public PortRectangle(IChart chart, IPort port, INode node)
-      : base(chart, PointD.Empty, Size.Empty, Pens.Black, Brushes.Red) {
+      : base(chart, PointD.Empty, Size.Empty) {
       nodeVisualProperties = (INodeVisualProperties)node.VisualProperties;
       nodeVisualProperties.Changed += NodeVisualProperties_Changed;
@@ -65 +90 @@
 
     protected virtual void RegisterNetworkItemEvents() {
+      if (VisualProperties != null) {
+        VisualProperties.Changed += VisualProperties_Changed;
+      }
       networkItem.NameChanged += NetworkItem_NameChanged;
-      if (networkItem.VisualProperties != null) {
-        networkItem.VisualProperties.Changed += VisualProperties_Changed;
-      }
       var connectablePort = networkItem as IConnectablePort;
       if (connectablePort != null) {
@@ -76 +101 @@
 
     protected virtual void DeregisterNetworkItemEvents() {
+      if (VisualProperties != null) {
+        VisualProperties.Changed -= VisualProperties_Changed;
+      }
       networkItem.NameChanged -= NetworkItem_NameChanged;
-      if (networkItem.VisualProperties != null) {
-        networkItem.VisualProperties.Changed -= VisualProperties_Changed;
-      }
       var connectablePort = networkItem as IConnectablePort;
       if (connectablePort != null) {
@@ -97 +122 @@
       var p = Chart.TransformWorldToPixel(Point);
 
-      if (networkItem != null && networkItem.VisualProperties != null) {
+      if (networkItem != null && VisualProperties != null) {
         using (var font = new Font(FontFamily.GenericSansSerif, (float)Math.Round(8.25 * Chart.WorldToPixelRatio.Width))) {
           var textSize = graphics.MeasureString(networkItem.Name, font);
-          var vp = (IPortVisualProperties)networkItem.VisualProperties;
+          var vp = VisualProperties;
           switch (vp.Orientation) {
             case Orientation.North: p = new Point((int)(p.X - textSize.Width / 2), (int)(p.Y - Size.Height - textSize.Height)); break;
@@ -179 +204 @@
 
     #region Helpers
-
-    private IPortVisualProperties CreateDefaultVisualProperties() {
-      return new PortVisualProperties(Orientation.South, 0.5);
-    }
-
     private void LoadVisualProperties() {
-      if (networkItem.VisualProperties == null)
-        networkItem.VisualProperties = CreateDefaultVisualProperties();
-
-      var vp = (IPortVisualProperties)networkItem.VisualProperties;
-      var p = PointD.Empty;
-      double nodeWidth = nodeVisualProperties.UpperRight.X - nodeVisualProperties.LowerLeft.X;
-      double nodeHeight = nodeVisualProperties.UpperRight.Y - nodeVisualProperties.LowerLeft.Y;
-
-      switch (vp.Orientation) {
-        case Orientation.North:
-          p.X = nodeVisualProperties.LowerLeft.X + vp.Offset * nodeWidth;
-          p.Y = nodeVisualProperties.UpperRight.Y;
-          break;
-        case Orientation.East:
-          p.X = nodeVisualProperties.UpperRight.X;
-          p.Y = nodeVisualProperties.UpperRight.Y - vp.Offset * nodeHeight;
-          break;
-        case Orientation.South:
-          p.X = nodeVisualProperties.UpperRight.X - vp.Offset * nodeWidth;
-          p.Y = nodeVisualProperties.LowerLeft.Y;
-          break;
-        case Orientation.West:
-          p.X = nodeVisualProperties.LowerLeft.X;
-          p.Y = nodeVisualProperties.LowerLeft.Y + vp.Offset * nodeHeight;
-          break;
-      }
-
-      SetPosition(p);
+      if (VisualProperties == null)
+        VisualProperties = new PortVisualProperties();
+
+      var vp = VisualProperties;
+      IgnoreVisualPropertiesChanges = true;
+      try {
+        var p = PointD.Empty;
+        double nodeWidth = nodeVisualProperties.UpperRight.X - nodeVisualProperties.LowerLeft.X;
+        double nodeHeight = nodeVisualProperties.UpperRight.Y - nodeVisualProperties.LowerLeft.Y;
+
+        switch (vp.Orientation) {
+          case Orientation.North:
+            p.X = nodeVisualProperties.LowerLeft.X + vp.Offset * nodeWidth;
+            p.Y = nodeVisualProperties.UpperRight.Y;
+            break;
+          case Orientation.East:
+            p.X = nodeVisualProperties.UpperRight.X;
+            p.Y = nodeVisualProperties.UpperRight.Y - vp.Offset * nodeHeight;
+            break;
+          case Orientation.South:
+            p.X = nodeVisualProperties.UpperRight.X - vp.Offset * nodeWidth;
+            p.Y = nodeVisualProperties.LowerLeft.Y;
+            break;
+          case Orientation.West:
+            p.X = nodeVisualProperties.LowerLeft.X;
+            p.Y = nodeVisualProperties.LowerLeft.Y + vp.Offset * nodeHeight;
+            break;
+        }
+
+        SetPosition(p);
+        Brush = new SolidBrush(vp.BrushColor);
+        Pen = new Pen(vp.PenColor);
+      } finally { IgnoreVisualPropertiesChanges = false; }
     }
 
     private void SaveVisualProperties() {
-      if (networkItem == null) return;
-
-      var vp = (IPortVisualProperties)networkItem.VisualProperties;
-
+      if (networkItem == null || IgnoreVisualPropertiesChanges) return;
+
+      var vp = VisualProperties;
       IgnoreVisualPropertiesChanges = true;
       try {
@@ -245 +269 @@
           }
         }
-      } finally {
-        IgnoreVisualPropertiesChanges = false;
-      }
+
+        vp.BrushColor = ((SolidBrush)Brush).Color;
+        vp.PenColor = Pen.Color;
+      } finally { IgnoreVisualPropertiesChanges = false; }
     }