Changeset 13833 for branches/OptimizationNetworks

Timestamp:

05/04/16 15:15:10 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added layout algorithm prototype
• fixed bug in LoadVisualProperties methods

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Networks.Views.NetworkVisualization.Views/3.3/NetworkVisualizationView.cs (modified) (3 diffs)
• HeuristicLab.Networks.Views.NetworkVisualization/3.3/HeuristicLab.Networks.Views.NetworkVisualization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Networks.Views.NetworkVisualization/3.3/Layout.cs (added)
• HeuristicLab.Networks.Views.NetworkVisualization/3.3/Primitives/AlgorithmNodeRectangle.cs (modified) (1 diff)
• HeuristicLab.Networks.Views.NetworkVisualization/3.3/Primitives/MessagePortRectangle.cs (modified) (1 diff)
• HeuristicLab.Networks.Views.NetworkVisualization/3.3/Primitives/NodeRectangle.cs (modified) (1 diff)
• HeuristicLab.Networks.Views.NetworkVisualization/3.3/Primitives/PortRectangle.cs (modified) (1 diff)

branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization.Views/3.3/NetworkVisualizationView.cs

@@ -65 +65 @@
       base.OnContentChanged();
       UpdateContent();
+      if (Content != null)
+        LayoutNodes(Content.Nodes);
       chartControl.Tag = Content;
     }
@@ -132 +134 @@
       chartControl.SuspendRendering();
       try {
+        foreach (var r in primitiveDict.Values.OfType<NodeRectangle>())
+          r.NetworkItem = null;
+        primitiveDict.Clear();
         chartControl.Chart.Group.Clear();
         DrawNodes(Content.Nodes);
@@ -174 +179 @@
       }
     }
+
+    private void LayoutNodes(IKeyedItemCollection<string, INode> nodes) {
+      var layout = new Layout();
+      var layoutNodes = new Dictionary<string, Layout.LayoutNode>();
+
+      foreach (var node in nodes) {
+        var nodeRectangle = primitiveDict[node.Name] as NodeRectangle;
+        if (nodeRectangle == null) continue;
+
+        var nodeSize = chartControl.Chart.TransformWorldToPixel(nodeRectangle.Size);
+        Layout.LayoutNode layoutNode;
+        if (!layoutNodes.TryGetValue(node.Name, out layoutNode)) {
+          layoutNodes.Add(node.Name, layoutNode = new Layout.LayoutNode(nodeSize));
+          layout.AddNode(layoutNode);
+        }
+
+        foreach (var port in node.Ports.OfType<IConnectablePort>()) {
+          var connectedPort = port.ConnectedPort as IConnectablePort;
+          if (connectedPort == null) continue;
+
+          var connectedNode = connectedPort.Parent;
+          if (connectedNode == null) continue;
+
+          var connectedRectangle = primitiveDict[connectedNode.Name] as NodeRectangle;
+          if (connectedRectangle == null) continue;
+
+          nodeSize = chartControl.Chart.TransformWorldToPixel(connectedRectangle.Size);
+          if (!layoutNodes.ContainsKey(connectedNode.Name)) {
+            layoutNodes.Add(connectedNode.Name, new Layout.LayoutNode(nodeSize));
+            layout.AddNode(layoutNodes[connectedNode.Name]);
+          }
+
+          layoutNode.AddNode(layoutNodes[connectedNode.Name]);
+        }
+      }
+
+      var bounds = chartControl.GetPictureBounds();
+      bounds.Offset((int)chartControl.Chart.LowerLeft.X, -(int)chartControl.Chart.UpperRight.Y);
+
+      layout.Arrange(bounds);
+
+      foreach (var entry in layoutNodes) {
+        var nodeRectangle = primitiveDict[entry.Key] as NodeRectangle;
+        if (nodeRectangle == null) continue;
+        var rectangleNode = entry.Value;
+        nodeRectangle.Move(rectangleNode.Location - nodeRectangle.Center());
+      }
+    }
     #endregion
   }

branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization/3.3/HeuristicLab.Networks.Views.NetworkVisualization-3.3.csproj

@@ -113 +113 @@
     <Compile Include="INodeVisualProperties.cs" />
     <Compile Include="IPortVisualProperties.cs" />
+    <Compile Include="Layout.cs" />
     <Compile Include="NodeVisualProperties.cs" />
     <Compile Include="Orientation.cs" />

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

@@ -30 +30 @@
     protected readonly Brush ActiveBrush = new SolidBrush(Color.FromArgb(255, 100, 200, 100));
 
+    public new IAlgorithmNode NetworkItem {
+      get { return (IAlgorithmNode)base.NetworkItem; }
+      set { base.NetworkItem = value; }
+    }
+
     public AlgorithmNodeRectangle(IChart chart, IAlgorithmNode node)
       : base(chart, node) {
       Brush = InactiveBrush;
-      node.Algorithm.Started += (sender, args) => Brush = ActiveBrush;
-      node.Algorithm.Stopped += (sender, args) => Brush = InactiveBrush;
-      node.StartedAlgorithmsChanged += (sender, args) => Brush = ((IAlgorithmNode)sender).StartedAlgorithms.Any() ? ActiveBrush : InactiveBrush;
     }
+
+    protected override void RegisterNetworkItemEvents() {
+      base.RegisterNetworkItemEvents();
+      NetworkItem.StartedAlgorithmsChanged += NetworkItem_StartedAlgorithmsChanged;
+      if (NetworkItem.Algorithm != null) {
+        NetworkItem.Algorithm.Started += Algorithm_Started; ;
+        NetworkItem.Algorithm.Stopped += Algorithm_Stopped; ;
+      }
+    }
+
+    protected override void DeregisterNetworkItemEvents() {
+      if (NetworkItem.Algorithm != null) {
+        NetworkItem.Algorithm.Stopped -= Algorithm_Stopped; ;
+        NetworkItem.Algorithm.Started -= Algorithm_Started; ;
+      }
+      NetworkItem.StartedAlgorithmsChanged -= NetworkItem_StartedAlgorithmsChanged;
+      base.DeregisterNetworkItemEvents();
+    }
+
+    private void NetworkItem_StartedAlgorithmsChanged(object sender, System.EventArgs e) {
+      Brush = ((IAlgorithmNode)sender).StartedAlgorithms.Any() ? ActiveBrush : InactiveBrush;
+    }
+    private void Algorithm_Started(object sender, System.EventArgs e) { Brush = ActiveBrush; }
+    private void Algorithm_Stopped(object sender, System.EventArgs e) { Brush = InactiveBrush; }
   }
 }

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

@@ -39 +39 @@
     public MessagePortRectangle(IChart chart, IMessagePort port, INode node)
       : base(chart, port, node) {
-      IdleBrush = new SolidBrush(VisualProperties.BrushColor);
-      port.MessageSent += (sender, args) => Highlight(MessageSentBrush);
-      port.MessageReceived += (sender, args) => Highlight(MessageReceivedBrush);
+      IdleBrush = Brush;
+    }
+
+    protected override void RegisterNetworkItemEvents() {
+      base.RegisterNetworkItemEvents();
+      NetworkItem.MessageSent += NetworkItem_MessageSent;
+      NetworkItem.MessageReceived += Port_MessageReceived;
+    }
+
+    protected override void DeregisterNetworkItemEvents() {
+      NetworkItem.MessageReceived -= Port_MessageReceived;
+      NetworkItem.MessageSent -= NetworkItem_MessageSent;
+      base.DeregisterNetworkItemEvents();
+    }
+
+    private void Port_MessageReceived(object sender, Common.EventArgs<IMessage, System.Threading.CancellationToken> e) {
+      Highlight(MessageReceivedBrush);
+    }
+
+
+    private void NetworkItem_MessageSent(object sender, Common.EventArgs<IMessage, System.Threading.CancellationToken> e) {
+      Highlight(MessageSentBrush);
     }
 

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

@@ -255 +255 @@
     #region Helpers
     private void LoadVisualProperties() {
-      if (VisualProperties == null)
-        VisualProperties = new NodeVisualProperties();
-
-      var vp = VisualProperties;
+      INodeVisualProperties vp = new NodeVisualProperties();
+
+      if (networkItem != null)
+        if (VisualProperties == null) VisualProperties = vp;
+        else vp = VisualProperties;
+
       IgnoreVisualPropertiesChanges = true;
       try {

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

@@ -205 +205 @@
     #region Helpers
     private void LoadVisualProperties() {
-      if (VisualProperties == null)
-        VisualProperties = new PortVisualProperties();
-
-      var vp = VisualProperties;
+      IPortVisualProperties vp = new PortVisualProperties();
+
+      if (networkItem != null)
+        if (VisualProperties == null) VisualProperties = vp;
+        else vp = VisualProperties;
+
       IgnoreVisualPropertiesChanges = true;
       try {