From f33e3d20691b26cc1188ba02d5cc55c11087c4ec Mon Sep 17 00:00:00 2001 From: Andrew Lalis Date: Wed, 27 Oct 2021 17:42:01 +0200 Subject: [PATCH] Made color dependent on referenced attribute. --- src/main/java/nl/andrewlalis/erme/model/Attribute.java | 2 +- .../erme/view/view_models/MappingModelViewModel.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/nl/andrewlalis/erme/model/Attribute.java b/src/main/java/nl/andrewlalis/erme/model/Attribute.java index 515222b..d2f73f7 100644 --- a/src/main/java/nl/andrewlalis/erme/model/Attribute.java +++ b/src/main/java/nl/andrewlalis/erme/model/Attribute.java @@ -51,7 +51,7 @@ public class Attribute { @Override public int hashCode() { - return Objects.hash(type, name); + return Objects.hash(type, relation, name); } @Override diff --git a/src/main/java/nl/andrewlalis/erme/view/view_models/MappingModelViewModel.java b/src/main/java/nl/andrewlalis/erme/view/view_models/MappingModelViewModel.java index cbad44c..dff8df8 100644 --- a/src/main/java/nl/andrewlalis/erme/view/view_models/MappingModelViewModel.java +++ b/src/main/java/nl/andrewlalis/erme/view/view_models/MappingModelViewModel.java @@ -7,6 +7,8 @@ import nl.andrewlalis.erme.model.MappingModel; import nl.andrewlalis.erme.model.Relation; import java.awt.*; +import java.awt.color.ColorSpace; +import java.util.Random; /** * View model for rendering an entire {@code MappingModel} object. @@ -30,17 +32,19 @@ public class MappingModelViewModel implements ViewModel { private void visualizeReferences(Graphics2D g) { Graphics2D g2 = (Graphics2D) g.create(); - g2.setColor(Color.BLUE); Stroke dashedStroke = new BasicStroke(2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 0, new float[]{5}, 0); g2.setStroke(dashedStroke); for (Relation r : this.model.getRelations()) { for (Attribute a : r.getAttributes()) { if (a instanceof ForeignKeyAttribute) { ForeignKeyAttribute fk = (ForeignKeyAttribute) a; + // Generate a random HSB color for the line, seeded using the referenced attribute's hash code. + Random random = new Random(fk.getReference().hashCode()); + g2.setColor(Color.getHSBColor(random.nextFloat(), 1.0f, 0.8f)); Rectangle sourceBounds = fk.getViewModel().getBounds(g); Rectangle targetBounds = fk.getReference().getViewModel().getBounds(g); - Point sourcePoint = new Point(sourceBounds.x + sourceBounds.width / 2, sourceBounds.y); - Point targetPoint = new Point(targetBounds.x + targetBounds.width / 2, targetBounds.y + targetBounds.height); + Point sourcePoint = new Point(sourceBounds.x + sourceBounds.width / 2, sourceBounds.y + 3 * targetBounds.height / 4); + Point targetPoint = new Point(targetBounds.x + targetBounds.width / 2, targetBounds.y + 3 * targetBounds.height / 4); g2.drawLine(sourcePoint.x, sourcePoint.y, targetPoint.x, targetPoint.y); } }