X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Fconnection%2FConnectionVisuals.java;h=e7a31692b5ea2cb22a5bda1bd044bdd3a199ad8c;hp=45e4079065f76f1932f26c04b5035f61229a13ec;hb=e3f46ffc9d4a6930adc83ebb8e6730f19708cc94;hpb=32a6aa7b656804c95b8a2a2df06900955c6df44b diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java index 45e407906..e7a31692b 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java @@ -25,15 +25,27 @@ public class ConnectionVisuals { public final float[] color; public final StrokeType strokeType; public final Stroke stroke; + public final Double branchPointRadius; public final Double rounding; + public final Double offset; public ConnectionVisuals(float[] color, StrokeType strokeType, Stroke stroke, Double rounding) { + this(color, strokeType, stroke, null, rounding); + } + + public ConnectionVisuals(float[] color, StrokeType strokeType, Stroke stroke, Double branchPointRadius, Double rounding) { + this(color, strokeType, stroke, null, rounding, null); + } + + public ConnectionVisuals(float[] color, StrokeType strokeType, Stroke stroke, Double branchPointRadius, Double rounding, Double offset) { if (color != null && color.length < 3) throw new IllegalArgumentException("colors must have at least 3 components (rgb), got " + color.length); this.color = color; this.strokeType = strokeType; this.stroke = stroke; + this.branchPointRadius = branchPointRadius; this.rounding = rounding; + this.offset = offset; } public Color toColor() { @@ -48,8 +60,10 @@ public class ConnectionVisuals { public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((branchPointRadius == null) ? 0 : branchPointRadius.hashCode()); result = prime * result + Arrays.hashCode(color); result = prime * result + ((rounding == null) ? 0 : rounding.hashCode()); + result = prime * result + ((offset == null) ? 0 : offset.hashCode()); result = prime * result + ((stroke == null) ? 0 : stroke.hashCode()); result = prime * result + ((strokeType == null) ? 0 : strokeType.hashCode()); return result; @@ -64,6 +78,11 @@ public class ConnectionVisuals { if (getClass() != obj.getClass()) return false; ConnectionVisuals other = (ConnectionVisuals) obj; + if (branchPointRadius == null) { + if (other.branchPointRadius != null) + return false; + } else if (!branchPointRadius.equals(other.branchPointRadius)) + return false; if (!Arrays.equals(color, other.color)) return false; if (rounding == null) { @@ -71,6 +90,11 @@ public class ConnectionVisuals { return false; } else if (!rounding.equals(other.rounding)) return false; + if (offset == null) { + if (other.offset != null) + return false; + } else if (!offset.equals(other.offset)) + return false; if (stroke == null) { if (other.stroke != null) return false; @@ -80,5 +104,4 @@ public class ConnectionVisuals { return false; return true; } - }