diff --git a/distAssembly.xml b/distAssembly.xml new file mode 100644 index 000000000..f5dc09b50 --- /dev/null +++ b/distAssembly.xml @@ -0,0 +1,45 @@ + + distribution + + zip + + + + ${basedir}/target/Digital.jar + / + + + + + ${basedir}/src/main/dig/combinatorial + /examples/combinatorial/ + + *.dig + + + + ${basedir}/src/main/dig/sequential + /examples/sequential/ + + *.dig + + + + ${basedir}/src/main/dig/processor + /examples/processor/ + + *.dig + + + + ${basedir}/src/main/dig/hazard + /examples/hazard/ + + *.dig + + + + + diff --git a/pom.xml b/pom.xml index 0798f1aca..cb61b233d 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,16 @@ single + + make-dstribution + install + + distAssembly.xml + + + single + + diff --git a/src/main/dig/processor/Processor.dig b/src/main/dig/processor/Processor.dig index 3ddc062c5..68685f971 100644 --- a/src/main/dig/processor/Processor.dig +++ b/src/main/dig/processor/Processor.dig @@ -232,6 +232,10 @@ Clock + + runRealTime + true + rotation @@ -242,7 +246,7 @@ Frequency - 50 + 100 diff --git a/src/main/java/de/neemann/digital/draw/shapes/TunnelShape.java b/src/main/java/de/neemann/digital/draw/shapes/TunnelShape.java index 4ed9b1312..8eb88638a 100644 --- a/src/main/java/de/neemann/digital/draw/shapes/TunnelShape.java +++ b/src/main/java/de/neemann/digital/draw/shapes/TunnelShape.java @@ -21,6 +21,7 @@ public class TunnelShape implements Shape { private final PinDescription input; private final String label; +// private ObservableValue inValue; /** * Creates a new instance @@ -41,16 +42,23 @@ public class TunnelShape implements Shape { @Override public InteractorInterface applyStateMonitor(IOState ioState, Observer guiObserver) { +// inValue = ioState.getInput(0).addObserverToValue(guiObserver); return null; } @Override public void drawTo(Graphic gr, boolean highLight) { +// if (inValue!=null) { +// Style style = Style.getWireStyle(inValue); +// Vector pos= new Vector(14,0); +// Vector rad = new Vector(3,3); +// gr.drawCircle(pos.sub(rad),pos.add(rad),style); +// } gr.drawPolygon(new Polygon(true) .add(0, 0) - .add(SIZE, SIZE2) - .add(SIZE, -SIZE2), Style.NORMAL); - Vector pos = new Vector(SIZE + SIZE2, 0); + .add(SIZE, SIZE2 - 3) + .add(SIZE, -SIZE2 + 3), Style.NORMAL); + Vector pos = new Vector(SIZE + SIZE2 / 2, 0); gr.drawText(pos, pos.add(1, 0), label, Orientation.LEFTCENTER, Style.SHAPE_PIN); } } diff --git a/src/main/resources/lang/lang_en.properties b/src/main/resources/lang/lang_en.properties index 323fabc8b..4cbb5cf37 100644 --- a/src/main/resources/lang/lang_en.properties +++ b/src/main/resources/lang/lang_en.properties @@ -251,3 +251,4 @@ elem_Decode_pin_sel=This input selects the enabled output elem_Text_tt=Shows a text in the circuit key_Default_tt=Is set if the model is started err_labelNotConnectedToNet_N=A tunnel {0} is not connected! +key_Width_tt=With of symbol if this circuit is used in an element ins an other circuit.