TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-17 00:44:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved graphics if an input is in high-z state and used as an output.

Browse Source
This commit is contained in:
hneemann 2018-03-11 13:40:06 +01:00
parent 4ee6e14a98
commit faffb650a9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/neemann/digital/draw/shapes/InputShape.java
View File

@ -40,6 +40,7 @@ public class InputShape implements Shape {
private IOState ioState; private IOState ioState;
private SingleValueDialog dialog; private SingleValueDialog dialog;
private Value value; private Value value;
private Value inValue;
private final boolean isHighZ; private final boolean isHighZ;
/** /**
@ -111,8 +112,11 @@ public class InputShape implements Shape {
@Override @Override
public void readObservableValues() { public void readObservableValues() {
if (ioState != null) if (ioState != null) {
value = ioState.getOutput(0).getCopy(); value = ioState.getOutput(0).getCopy();
if (ioState.inputCount() == 1)
inValue = ioState.getInput(0).getCopy();
}
} }
@Override @Override
@ -124,17 +128,22 @@ public class InputShape implements Shape {
graphic.drawText(textPos, textPos.add(1, 0), label, Orientation.RIGHTCENTER, Style.INOUT); graphic.drawText(textPos, textPos.add(1, 0), label, Orientation.RIGHTCENTER, Style.INOUT);
} else { } else {
Style style = Style.NORMAL; Style style = Style.NORMAL;
final Polygon box = new Polygon(true).add(-SIZE * 2 - 1, -SIZE).add(-1, -SIZE).add(-1, SIZE).add(-SIZE * 2 - 1, SIZE);
if (value != null) { if (value != null) {
style = Style.getWireStyle(value); style = Style.getWireStyle(value);
if (value.getBits() > 1) { if (value.getBits() > 1) {
Vector textPos = new Vector(-1 - SIZE, -4 - SIZE); Vector textPos = new Vector(-1 - SIZE, -4 - SIZE);
graphic.drawText(textPos, textPos.add(1, 0), format.formatToView(value), Orientation.CENTERBOTTOM, Style.NORMAL); graphic.drawText(textPos, textPos.add(1, 0), format.formatToView(value), Orientation.CENTERBOTTOM, Style.NORMAL);
} else {
if (inValue != null && !inValue.isEqual(value))
graphic.drawPolygon(box, Style.getWireStyle(inValue));
} }
} }
graphic.drawPolygon(box, Style.NORMAL);
Vector center = new Vector(-1 - SIZE, 0); Vector center = new Vector(-1 - SIZE, 0);
graphic.drawCircle(center.sub(RAD), center.add(RAD), style); graphic.drawCircle(center.sub(RAD), center.add(RAD), style);
graphic.drawPolygon(new Polygon(true).add(-SIZE * 2 - 1, -SIZE).add(-1, -SIZE).add(-1, SIZE).add(-SIZE * 2 - 1, SIZE), Style.NORMAL);
Vector textPos = new Vector(-SIZE * 3, 0); Vector textPos = new Vector(-SIZE * 3, 0);
graphic.drawText(textPos, textPos.add(1, 0), label, Orientation.RIGHTCENTER, Style.INOUT); graphic.drawText(textPos, textPos.add(1, 0), label, Orientation.RIGHTCENTER, Style.INOUT);