From baae6e66d45a0276be8bb746df4d64c7f98d1ba8 Mon Sep 17 00:00:00 2001 From: hneemann Date: Mon, 19 Dec 2016 16:39:31 +0100 Subject: [PATCH] wire values are green now --- src/main/java/de/neemann/digital/draw/elements/Wire.java | 4 ++-- src/main/java/de/neemann/digital/draw/graphics/Style.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/elements/Wire.java b/src/main/java/de/neemann/digital/draw/elements/Wire.java index 81a759dbc..6ce90f056 100644 --- a/src/main/java/de/neemann/digital/draw/elements/Wire.java +++ b/src/main/java/de/neemann/digital/draw/elements/Wire.java @@ -14,7 +14,7 @@ import java.util.Collection; * @author hneemann */ public class Wire implements Drawable, Moveable { - private static final int MIN_LABEL_LEN = 100; + private static final int MIN_LABEL_LEN = 80; /** * The first endpoint of the line */ @@ -60,7 +60,7 @@ public class Wire implements Drawable, Moveable { if (value != null && p1.y == p2.y && Math.abs(p1.x - p2.x) > MIN_LABEL_LEN && value.getBits() > 1) { Vector pos = p1.add(p2).div(2).add(0, -3); - graphic.drawText(pos, pos.add(1, 0), value.getValueString(), de.neemann.digital.draw.graphics.Orientation.CENTERBOTTOM, Style.SHAPE_PIN); + graphic.drawText(pos, pos.add(1, 0), value.getValueString(), de.neemann.digital.draw.graphics.Orientation.CENTERBOTTOM, Style.WIRE_VALUE); } if (p1Dot || p2Dot) { diff --git a/src/main/java/de/neemann/digital/draw/graphics/Style.java b/src/main/java/de/neemann/digital/draw/graphics/Style.java index cf3a5a06e..21ca54bfa 100644 --- a/src/main/java/de/neemann/digital/draw/graphics/Style.java +++ b/src/main/java/de/neemann/digital/draw/graphics/Style.java @@ -63,6 +63,10 @@ public class Style { * Used to draw the pin description text */ public static final Style SHAPE_PIN = new Style(LINETHICK, false, Color.GRAY, 18, null); + /** + * Used to draw the pin description text + */ + public static final Style WIRE_VALUE = new Style(LINETHICK, false, new Color(50, 162, 50), 18, null); /** * highlight color used for the circles to mark an element */