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

minor changes on muxer shapes

Browse Source
This commit is contained in:
hneemann 2016-04-01 21:50:47 +02:00
parent 000d1bc6fb
commit 18b90f0a40
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/dig/Ampel_Einfach.dig
View File

@ -6,7 +6,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>Z_0</string>
<string>z_0</string>
</entry>
</elementAttributes>
<pos x="240" y="190"/>
@ -17,7 +17,7 @@
<elementAttributes>
<entry>
<string>Label</string>
<string>Z_1</string>
<string>z_1</string>
</entry>
</elementAttributes>
<pos x="240" y="130"/>

22
src/main/dig/processor/Processor.dig
View File

@ -371,7 +371,7 @@
<elementAttributes>
<entry>
<string>rotation</string>
<rotation rotation="1"/>
<rotation rotation="2"/>
</entry>
<entry>
<string>Label</string>
@ -382,8 +382,8 @@
<int>1000</int>
</entry>
</elementAttributes>
<pos x="560" y="230"/>
<rotate>1</rotate>
<pos x="520" y="230"/>
<rotate>2</rotate>
</visualElement>
<visualElement>
<elementName>Probe</elementName>
@ -739,10 +739,10 @@
</wire>
<wire>
<p1 x="490" y="210"/>
<p2 x="560" y="210"/>
<p2 x="510" y="210"/>
</wire>
<wire>
<p1 x="560" y="210"/>
<p1 x="510" y="210"/>
<p2 x="630" y="210"/>
</wire>
<wire>
@ -873,6 +873,10 @@
<p1 x="90" y="230"/>
<p2 x="100" y="230"/>
</wire>
<wire>
<p1 x="510" y="230"/>
<p2 x="520" y="230"/>
</wire>
<wire>
<p1 x="100" y="230"/>
<p2 x="130" y="230"/>
@ -1125,10 +1129,6 @@
<p1 x="110" y="70"/>
<p2 x="110" y="140"/>
</wire>
<wire>
<p1 x="560" y="210"/>
<p2 x="560" y="230"/>
</wire>
<wire>
<p1 x="370" y="60"/>
<p2 x="370" y="80"/>
@ -1177,6 +1177,10 @@
<p1 x="380" y="80"/>
<p2 x="380" y="90"/>
</wire>
<wire>
<p1 x="510" y="210"/>
<p2 x="510" y="230"/>
</wire>
<wire>
<p1 x="190" y="70"/>
<p2 x="190" y="250"/>

10
src/main/java/de/neemann/digital/draw/shapes/DemuxerShape.java
View File

@ -51,10 +51,10 @@ public class DemuxerShape implements Shape {
@Override
public void drawTo(Graphic graphic, boolean highLight) {
graphic.drawPolygon(new Polygon(true)
.add(1, 3)
.add(SIZE * 2 - 1, -2)
.add(SIZE * 2 - 1, height + 2)
.add(1, height - 3), Style.NORMAL);
graphic.drawText(new Vector(SIZE * 2 - 2, 0), new Vector(SIZE * 2, 0), "0", Orientation.RIGHTTOP, Style.SHAPE_PIN);
.add(1, 5)
.add(SIZE * 2 - 1, -4)
.add(SIZE * 2 - 1, height + 4)
.add(1, height - 5), Style.NORMAL);
graphic.drawText(new Vector(SIZE * 2 - 3, 0), new Vector(SIZE * 2, 0), "0", Orientation.RIGHTTOP, Style.SHAPE_PIN);
}
}

8
src/main/java/de/neemann/digital/draw/shapes/MuxerShape.java
View File

@ -46,10 +46,10 @@ public class MuxerShape implements Shape {
@Override
public void drawTo(Graphic graphic, boolean heighLight) {
graphic.drawPolygon(new Polygon(true)
.add(1, -2)
.add(SIZE * 2 - 1, 3)
.add(SIZE * 2 - 1, inputCount * SIZE - 3)
.add(1, inputCount * SIZE + 2), Style.NORMAL);
.add(1, -4)
.add(SIZE * 2 - 1, 5)
.add(SIZE * 2 - 1, inputCount * SIZE - 5)
.add(1, inputCount * SIZE + 4), Style.NORMAL);
graphic.drawText(new Vector(3, 0), new Vector(4, 0), "0", Orientation.LEFTTOP, Style.SHAPE_PIN);
}
}