added pin numbers to input/output labels

This commit is contained in:
hneemann 2017-05-13 10:54:24 +02:00
parent cc7a2bb3ba
commit ae74fe5bf0
2 changed files with 12 additions and 2 deletions

View File

@ -4,6 +4,7 @@ import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.core.element.Element; import de.neemann.digital.core.element.Element;
import de.neemann.digital.core.element.ElementAttributes; 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.core.element.PinDescriptions;
import de.neemann.digital.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
@ -39,7 +40,11 @@ public class InputShape implements Shape {
*/ */
public InputShape(ElementAttributes attr, PinDescriptions inputs, PinDescriptions outputs) { public InputShape(ElementAttributes attr, PinDescriptions inputs, PinDescriptions outputs) {
this.outputs = 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 @Override

View File

@ -3,6 +3,7 @@ package de.neemann.digital.draw.shapes;
import de.neemann.digital.core.ObservableValue; import de.neemann.digital.core.ObservableValue;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.Observer;
import de.neemann.digital.core.element.ElementAttributes; 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.core.element.PinDescriptions;
import de.neemann.digital.draw.elements.IOState; import de.neemann.digital.draw.elements.IOState;
import de.neemann.digital.draw.elements.Pin; import de.neemann.digital.draw.elements.Pin;
@ -42,7 +43,11 @@ public class OutputShape implements Shape {
*/ */
public OutputShape(ElementAttributes attr, PinDescriptions inputs, PinDescriptions outputs) { public OutputShape(ElementAttributes attr, PinDescriptions inputs, PinDescriptions outputs) {
this.inputs = inputs; 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 @Override