Don't use hierachical layout in VisJS graphs.

stratisdevex · Jul 25, 2023 · dd6ae7b · dd6ae7b
1 parent 4a1887f
commit dd6ae7b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/Stratis.DevEx.Drawing/VisJS/Network.cs b/src/Stratis.DevEx.Drawing/VisJS/Network.cs
@@ -98,6 +98,21 @@ public class NetworkHierarchical
 
         [JsonProperty("levelSeparation"), JsonSuppressDefaultValue]
         public int? LevelSeparation { get; set; }
+
+        [JsonProperty("treeSpacing"), JsonSuppressDefaultValue]
+        public int TreeSpacing { get; set; }
+
+        [JsonProperty("blockShifting"), JsonSuppressDefaultValue]
+        public bool BlockShifting { get; set; }
+
+        [JsonProperty("edgeMinimization"), JsonSuppressDefaultValue]
+        public bool edgeMinimization { get; set; }
+
+        [JsonProperty("parentCentralization"), JsonSuppressDefaultValue]
+        public bool parentCentralization { get; set; }
+
+        [JsonProperty("shakeTowards"), JsonSuppressDefaultValue]
+        public string? ShakeTowards { get; set; }
     }
 
     public class NetworkHierarchicalRepulsion
@@ -116,6 +131,9 @@ public class NetworkLayout
 
         [JsonProperty("hierarchical"), JsonSuppressDefaultValue]
         public NetworkHierarchical? Hierarchical { get; set; }
+
+        [JsonProperty("clusterThreshold"), JsonSuppressDefaultValue]
+        public int ClusterThreshold { get; set; }
     }
 
     public class NetworkNode
@@ -279,6 +297,7 @@ public class NetworkColor
     }
 
 }
+
 /*
  * // these are all options in full.
 var options = {

diff --git a/src/Stratis.DevEx.Drawing/VisJS/VisJS.cs b/src/Stratis.DevEx.Drawing/VisJS/VisJS.cs
@@ -21,35 +21,37 @@ public static Network Draw(Graph graph, string width="100%", string height="100%
             var network = new Network();
             var options = new NetworkOptions();
             options.Width = width;
-            options.Height = "1200px";
+            options.Height = height;
             string? nodeshape = null;
             int? nodesize = null;
 
             switch (graph.Kind)
             {
                 case "cfg":
                 case "cg":
-                    options.AutoResize = true;
+                    options.AutoResize = false;
                     var layout = new NetworkLayout()
                     {
                         ImprovedLayout = true,
-
+                        /*
                         Hierarchical = new NetworkHierarchical()
                         {
                             Enabled = true,
                             SortMethod = "directed",
                             Direction = "UD",
                             NodeSpacing = 150,
                             LevelSeparation = 150,
-                        }
+                        }*/
                     };
                     var physics = new NetworkPhysics()
                     {
+
                         HierarchicalRepulsion = new NetworkHierarchicalRepulsion()
                         {
-                            AvoidOverlap = 1.0,
-                            NodeDistance = 150,
+                            AvoidOverlap = 2.0,
+                            NodeDistance = 250,
                         }
+
                     };
                     var edgesOptions = new NetworkEdgesOptions()
                     {