From ae74fe5bf0464fae005b8eec10da6152d823e027 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sat, 13 May 2017 10:54:24 +0200 Subject: [PATCH] added pin numbers to input/output labels --- .../java/de/neemann/digital/draw/shapes/InputShape.java | 7 ++++++- .../java/de/neemann/digital/draw/shapes/OutputShape.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/shapes/InputShape.java b/src/main/java/de/neemann/digital/draw/shapes/InputShape.java index 2ebfd390c..63587cb34 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/InputShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/InputShape.java @@ -4,6 +4,7 @@ import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.Observer; import de.neemann.digital.core.element.Element; import de.neemann.digital.core.element.ElementAttributes; +import de.neemann.digital.core.element.Keys; import de.neemann.digital.core.element.PinDescriptions; import de.neemann.digital.draw.elements.IOState; import de.neemann.digital.draw.elements.Pin; @@ -39,7 +40,11 @@ public class InputShape implements Shape { */ public InputShape(ElementAttributes attr, PinDescriptions inputs, PinDescriptions outputs) { this.outputs = outputs; - this.label = attr.getLabel(); + int pinNumber =attr.get(Keys.PINNUMBER); + if (pinNumber==0) + this.label = attr.getLabel(); + else + this.label = attr.getLabel()+" ("+pinNumber+")"; } @Override diff --git a/src/main/java/de/neemann/digital/draw/shapes/OutputShape.java b/src/main/java/de/neemann/digital/draw/shapes/OutputShape.java index 8d4bba181..f723b4782 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/OutputShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/OutputShape.java @@ -3,6 +3,7 @@ package de.neemann.digital.draw.shapes; import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.Observer; import de.neemann.digital.core.element.ElementAttributes; +import de.neemann.digital.core.element.Keys; import de.neemann.digital.core.element.PinDescriptions; import de.neemann.digital.draw.elements.IOState; import de.neemann.digital.draw.elements.Pin; @@ -42,7 +43,11 @@ public class OutputShape implements Shape { */ public OutputShape(ElementAttributes attr, PinDescriptions inputs, PinDescriptions outputs) { this.inputs = inputs; - this.label = attr.getLabel(); + int pinNumber =attr.get(Keys.PINNUMBER); + if (pinNumber==0) + this.label = attr.getLabel(); + else + this.label = attr.getLabel()+" ("+pinNumber+")"; } @Override