Merge branch 'Brains-per_cluster_settings_for_sugiyama'

microsoft · May 27, 2022 · 47d30d6 · 47d30d6
2 parents e95bca6 + 5e7b59a
commit 47d30d6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/GraphLayout/MSAGL/Layout/Layered/SugiyamaLayoutSettings.cs b/GraphLayout/MSAGL/Layout/Layered/SugiyamaLayoutSettings.cs
@@ -437,5 +437,9 @@ public double GridSizeByX
             set { gridSizeByX = value; }
         }
 
+        /// <summary>
+        /// Settings per Cluster for InitialLayoutByCluster used by LayoutHelpers.ProcessSugiamaLayout
+        /// </summary>
+        public Dictionary<object, LayoutAlgorithmSettings> ClusterSettings { get; set; } = new Dictionary<object, LayoutAlgorithmSettings>();
     }
 }
diff --git a/GraphLayout/MSAGL/Miscellaneous/LayoutHelpers.cs b/GraphLayout/MSAGL/Miscellaneous/LayoutHelpers.cs
@@ -89,7 +89,13 @@ public static class LayoutHelpers {
 
             if (geometryGraph.RootCluster.Clusters.Any()) {
                 PrepareGraphForInitialLayoutByCluster(geometryGraph, sugiyamaLayoutSettings);
-                var initialBc = new InitialLayoutByCluster(geometryGraph, a => sugiyamaLayoutSettings);
+                var initialBc = 
+                    new InitialLayoutByCluster(
+                        geometryGraph, 
+                        //use different settings per each Cluster if available
+                        c => sugiyamaLayoutSettings.ClusterSettings.ContainsKey(c.UserData) 
+                                 ? sugiyamaLayoutSettings.ClusterSettings[c.UserData] 
+                                 : sugiyamaLayoutSettings);
                 initialBc.Run(cancelToken);
                 //route the rest of the edges, those between the clusters
                 var edgesToRoute = sugiyamaLayoutSettings.EdgeRoutingSettings.EdgeRoutingMode == EdgeRoutingMode.SplineBundling ? geometryGraph.Edges.ToArray() : geometryGraph.Edges.Where(e => e.Curve == null).ToArray();

diff --git a/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.cs b/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -8,8 +8,10 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using Microsoft.Msagl.Core.Geometry.Curves;
 using Microsoft.Msagl.Core.Routing;
 using Microsoft.Msagl.Drawing;
+using Microsoft.Msagl.Layout.Layered;
 using Microsoft.Msagl.WpfGraphControl;
 using Microsoft.Win32;
 using Color = Microsoft.Msagl.Drawing.Color;
@@ -295,8 +297,7 @@ void SetFileMenu(Menu mainMenu)
 
 
                 var subgraph = new Subgraph("subgraph1");
-                subgraph.Label.Text = "Outer Subgraph";
-                subgraph.Attr.ClusterLabelMargin = LabelPlacement.Bottom;
+                subgraph.Label.Text = "Outer";
                 graph.RootSubgraph.AddSubgraph(subgraph);
                 subgraph.AddNode(graph.FindNode("47"));
                 subgraph.AddNode(graph.FindNode("58"));
@@ -305,14 +306,21 @@ void SetFileMenu(Menu mainMenu)
                 subgraph2.Label.Text = "Inner";
                 subgraph2.Attr.Color = Color.Black;
                 subgraph2.Attr.FillColor = Color.Yellow;
-                subgraph2.Attr.ClusterLabelMargin = LabelPlacement.Left;
+                subgraph2.Attr.ClusterLabelMargin = LabelPlacement.Bottom;
                 subgraph2.AddNode(graph.FindNode("70"));
                 subgraph2.AddNode(graph.FindNode("71"));
                 subgraph.AddSubgraph(subgraph2);
                 graph.AddEdge("58", subgraph2.Id);
 
                 graph.Attr.LayerDirection = LayerDirection.LR;
                 //graph.LayoutAlgorithmSettings.EdgeRoutingSettings.EdgeRoutingMode = EdgeRoutingMode.Rectilinear;
+
+                var global = (SugiyamaLayoutSettings) graph.LayoutAlgorithmSettings;
+                var local  = (SugiyamaLayoutSettings) global.Clone();
+                local.Transformation = PlaneTransformation.Rotation(-Math.PI / 2);
+                subgraph2.LayoutSettings = local;   // for Collapsing\Expanding
+                global.ClusterSettings.Add(subgraph2, local);
+
                 graphViewer.Graph = graph;
             }
             catch (Exception e)