From ee09a7f4cf3129c11558b0ed58ed06435078a755 Mon Sep 17 00:00:00 2001 From: brunomnsilva Date: Sun, 17 Mar 2024 11:48:53 +0000 Subject: [PATCH] Fix bug when estimating arrow positioning. --- .../graphview/SmartGraphEdgeCurve.java | 7 ++++++- .../smartgraph/graphview/SmartGraphEdgeLine.java | 16 ++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphEdgeCurve.java b/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphEdgeCurve.java index 4318323..6e6a789 100644 --- a/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphEdgeCurve.java +++ b/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphEdgeCurve.java @@ -94,6 +94,11 @@ public SmartGraphEdgeCurve(Edge edge, SmartGraphVertexNode inbound, Sma enableListeners(); } + @Override + public void setStyleInline(String css) { + styleProxy.setStyleInline(css); + } + @Override public void setStyleClass(String cssClass) { styleProxy.setStyleClass(cssClass); @@ -219,7 +224,7 @@ public void attachArrow(SmartArrow arrow) { arrow.getTransforms().add(rotation); /* add translation transform to put the arrow touching the circle's bounds */ - Translate t = new Translate(-outbound.getRadius(), 0); + Translate t = new Translate(-inbound.getRadius(), 0); arrow.getTransforms().add(t); } diff --git a/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphEdgeLine.java b/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphEdgeLine.java index 92b16e5..dd10825 100644 --- a/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphEdgeLine.java +++ b/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphEdgeLine.java @@ -41,8 +41,8 @@ public class SmartGraphEdgeLine extends Line implements SmartGraphEdgeBase private final Edge underlyingEdge; - private final SmartGraphVertexNode inbound; - private final SmartGraphVertexNode outbound; + private final SmartGraphVertexNode inbound; + private final SmartGraphVertexNode outbound; private SmartLabel attachedLabel = null; private SmartArrow attachedArrow = null; @@ -50,7 +50,7 @@ public class SmartGraphEdgeLine extends Line implements SmartGraphEdgeBase /* Styling proxy */ private final SmartStyleProxy styleProxy; - public SmartGraphEdgeLine(Edge edge, SmartGraphVertexNode inbound, SmartGraphVertexNode outbound) { + public SmartGraphEdgeLine(Edge edge, SmartGraphVertexNode inbound, SmartGraphVertexNode outbound) { if( inbound == null || outbound == null) { throw new IllegalArgumentException("Cannot connect null vertices."); } @@ -69,7 +69,12 @@ public SmartGraphEdgeLine(Edge edge, SmartGraphVertexNode inbound, SmartGr this.endXProperty().bind(inbound.centerXProperty()); this.endYProperty().bind(inbound.centerYProperty()); } - + + @Override + public void setStyleInline(String css) { + styleProxy.setStyleInline(css); + } + @Override public void setStyleClass(String cssClass) { styleProxy.setStyleClass(cssClass); @@ -125,9 +130,8 @@ public void attachArrow(SmartArrow arrow) { arrow.getTransforms().add(rotation); /* add translation transform to put the arrow touching the circle's bounds */ - Translate t = new Translate(- outbound.getRadius(), 0); + Translate t = new Translate(-inbound.getRadius(), 0); arrow.getTransforms().add(t); - } @Override