Changeset 14275 for branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChart.cs

Timestamp:

09/07/16 15:20:29 (8 years ago)

Author:

bburlacu

Message:

#2288: Clean up code and add comments in the ConstrainedForceDirectedLayout class. Minor changes to view and directed graph chart. Introduced an INetworkNode interface for more flexibility. Updated cola and adaptagrams dlls with latest changes from upstream.

File:

• branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChart.cs (modified) (5 diffs)

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChart.cs

@@ -39 +39 @@
     public new Bitmap Picture { get { return base.Picture; } }
 
-    private ConstrainedForceDirectedLayout layout;
+    private readonly ConstrainedForceDirectedLayout layout;
     // provide direct and reverse mapping between graph objects and layout shapes
     private Dictionary<IPrimitive, IVertex> vertexMap;
@@ -47 +47 @@
 
     // graph layout options
-    public double IdealEdgeLength { get; set; }
-    public bool PerformEdgeRouting { get; set; }
-    public Routing RoutingMode { get; set; }
+    public double DefaultEdgeLength {
+      get { return layout.DefaultEdgeLength; }
+      set { layout.DefaultEdgeLength = value; }
+    }
+
+    public bool PerformEdgeRouting {
+      get { return layout.PerformEdgeRouting; }
+      set { layout.PerformEdgeRouting = value; }
+    }
+
+    public Routing RoutingMode {
+      get { return layout.EdgeRoutingMode; }
+      set { layout.EdgeRoutingMode = value; }
+    }
 
     public IVertex GetVertex(IPrimitive primitive) {
@@ -87 +98 @@
       shapes = new Dictionary<Type, LabeledPrimitive>();
       SmoothingMode = SmoothingMode.HighQuality; // set antialiasing for nicer rendering
-      IdealEdgeLength = 50;
+
+      layout = new ConstrainedForceDirectedLayout {
+        LayoutWidth = (int)Chart.Size.Width,
+        LayoutHeight = (int)Chart.Size.Height,
+        MinHorizontalSpacing = 0,
+        MinVerticalSpacing = 0,
+      };
     }
 
@@ -124 +141 @@
         vertexRectangles[v] = new RectangleF(x, y, width, height);
       }
-      layout = new ConstrainedForceDirectedLayout {
-        DefaultEdgeLength = IdealEdgeLength,
-        PerformEdgeRouting = PerformEdgeRouting,
-        LayoutWidth = (int)Chart.Size.Width,
-        LayoutHeight = (int)Chart.Size.Height,
-        MinHorizontalSpacing = 0,
-        MinVerticalSpacing = 0,
-        EdgeRoutingMode = RoutingMode
-      };
 
       var arcs = graph.Vertices.SelectMany(x => x.InArcs).ToList();
@@ -236 +244 @@
 
     private void ShapeRedrawRequired(object sender, EventArgs args) {
-      layout.Run();
     }