Skip to content

Commit bc1ebcc

Browse files
committed
remove IncrementalRun on LayeredLayouEngine
Signed-off-by: Lev Nachmanson <[email protected]>
1 parent d446028 commit bc1ebcc

File tree

4 files changed

+5
-22
lines changed

4 files changed

+5
-22
lines changed

GraphLayout/MSAGL/Miscellaneous/LayoutHelpers.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -232,20 +232,6 @@ public static void RouteAndLabelEdges(GeometryGraph geometryGraph, LayoutAlgorit
232232

233233

234234

235-
/// <summary>
236-
/// adaptes to the node boundary curve change
237-
/// </summary>
238-
public static void IncrementalLayout(GeometryGraph geometryGraph, Node node, SugiyamaLayoutSettings settings) {
239-
if (settings == null)
240-
return;
241-
var engine = geometryGraph.AlgorithmData as LayeredLayoutEngine;
242-
243-
if (engine != null) {
244-
engine.IncrementalRun(node);
245-
PostRunTransform(geometryGraph, settings);
246-
}
247-
}
248-
249235
static void PostRunTransform(GeometryGraph geometryGraph, SugiyamaLayoutSettings settings) {
250236
bool transform = !settings.Transformation.IsIdentity;
251237
if (transform) {

GraphLayout/Samples/EdgeDirectionTest/Form1.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ private void viewer_MouseDown(object sender, MsaglMouseEventArgs e)
5353
Node n = new Node(this.FindNewId());
5454
IViewerNode iwn = gv.CreateIViewerNode(n, p, true);
5555
gv.AddNode(iwn, true);
56-
}
57-
else if (ob is IViewerNode) {
56+
gv.ResizeNodeToLabel(n);
57+
} else if (ob is IViewerNode) {
5858
IViewerNode existingNode = ob as IViewerNode;
5959
gv.RemoveNode(existingNode, true);
6060
}

GraphLayout/Test/TestForGDI/Form2.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,8 @@ void GViewerKeyDown(object sender, KeyEventArgs e) {
192192

193193
void EnlargeNode(IViewerNode node) {
194194
var geomNode = node.DrawingObject.GeometryObject as AglNode;
195-
geomNode.BoundaryCurve = geomNode.BoundaryCurve.OffsetCurve(geomNode.BoundingBox.Width/2,
196-
new Point(1, 0));
197-
LayoutHelpers.IncrementalLayout(gViewer.Graph.GeometryGraph, geomNode, gViewer.Graph.LayoutAlgorithmSettings as SugiyamaLayoutSettings);
195+
geomNode.BoundaryCurve = geomNode.BoundaryCurve.OffsetCurve(geomNode.BoundingBox.Width / 2, new Point(1, 0));
196+
198197
}
199198

200199

GraphLayout/tools/GraphViewerGDI/GViewer.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2305,9 +2305,7 @@ public void ResizeNodeToLabel(DrawingNode node) {
23052305
Point originalCenter = node.GeometryNode.Center;
23062306
node.GeometryNode.BoundaryCurve = NodeBoundaryCurves.GetNodeBoundaryCurve(node, width, height).Clone();
23072307
node.GeometryNode.BoundaryCurve.Translate(originalCenter);
2308-
2309-
LayoutHelpers.IncrementalLayout(Graph.GeometryGraph, node.GeometryNode,
2310-
Graph.LayoutAlgorithmSettings as SugiyamaLayoutSettings);
2308+
23112309
foreach (IViewerObject en in Entities)
23122310
Invalidate(en);
23132311

0 commit comments

Comments
 (0)