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

minor changes to ieee shapes

Browse Source
This commit is contained in:
helmut.neemann 2016-05-11 13:07:01 +02:00
parent e14b44bfeb
commit ac34655662
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,11 +21,11 @@ public class IEEEAndShape extends IEEEGenericShape {
private static Polygon createPoly() { private static Polygon createPoly() {
return new Polygon(true) return new Polygon(true)
.add(SIZE + SIZE2, SIZE * 2 + SIZE2) .add(SIZE + SIZE2, SIZE * 2 + SIZE2)
.add(0, SIZE * 2 + SIZE2) .add(1, SIZE * 2 + SIZE2)
.add(0, -SIZE2) .add(1, -SIZE2)
.add(SIZE + SIZE2, -SIZE2) .add(SIZE + SIZE2, -SIZE2)
.add(new Vector(SIZE*2, -SIZE2),new Vector(SIZE*3, 0),new Vector(SIZE*3, SIZE)) .add(new Vector(SIZE*2, -SIZE2),new Vector(SIZE*3, 0),new Vector(SIZE*3-1, SIZE))
.add(new Vector(SIZE*3, SIZE*2),new Vector(SIZE*2, SIZE*2+SIZE2),new Vector(SIZE+SIZE2, SIZE*2+SIZE2)); .add(new Vector(SIZE*3-1, SIZE*2),new Vector(SIZE*2, SIZE*2+SIZE2),new Vector(SIZE+SIZE2, SIZE*2+SIZE2));
} }
/** /**

4
src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEGenericShape.java
View File

@ -59,9 +59,9 @@ public abstract class IEEEGenericShape implements Shape {
drawIEEE(new GraphicTransform(graphic, v -> v.add(0, offs))); drawIEEE(new GraphicTransform(graphic, v -> v.add(0, offs)));
if (offs > 0) { if (offs > 0) {
graphic.drawLine(new Vector(0, 0), new Vector(0, offs - SIZE2), Style.NORMAL); graphic.drawLine(new Vector(1, 0), new Vector(1, offs - SIZE2 - 1), Style.NORMAL);
int h = (inputs.length / 2) * SIZE * 2; int h = (inputs.length / 2) * SIZE * 2;
graphic.drawLine(new Vector(0, h), new Vector(0, h - offs + SIZE2), Style.NORMAL); graphic.drawLine(new Vector(1, h), new Vector(1, h - offs + SIZE2 + 1), Style.NORMAL);
} }
if (invert) { if (invert) {

2
src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEOrShape.java
View File

@ -28,7 +28,7 @@ public class IEEEOrShape extends IEEEGenericShape {
.add(SIZE2, -SIZE2) .add(SIZE2, -SIZE2)
.add(new Vector(SIZE, -SIZE2), .add(new Vector(SIZE, -SIZE2),
new Vector(SIZE * 2, 0), new Vector(SIZE * 2, 0),
new Vector(SIZE * 3, SIZE)) new Vector(SIZE * 3-1, SIZE))
.add(new Vector(SIZE * 2, SIZE * 2), .add(new Vector(SIZE * 2, SIZE * 2),
new Vector(SIZE, SIZE * 2 + SIZE2), new Vector(SIZE, SIZE * 2 + SIZE2),
new Vector(SIZE2, SIZE * 2 + SIZE2)); new Vector(SIZE2, SIZE * 2 + SIZE2));

6
src/main/java/de/neemann/digital/draw/shapes/ieee/IEEEXOrShape.java
View File

@ -21,16 +21,16 @@ public class IEEEXOrShape extends IEEEGenericShape {
private static Polygon createPoly() { private static Polygon createPoly() {
return new Polygon(true) return new Polygon(true)
.add(SIZE2, SIZE * 2 + SIZE2) .add(SIZE2+1, SIZE * 2 + SIZE2)
.add(new Vector(SIZE, SIZE * 2), .add(new Vector(SIZE, SIZE * 2),
new Vector(SIZE, 0), new Vector(SIZE, 0),
new Vector(SIZE2, -SIZE2)) new Vector(SIZE2, -SIZE2))
.add(new Vector(SIZE, -SIZE2), .add(new Vector(SIZE, -SIZE2),
new Vector(SIZE * 2, 0), new Vector(SIZE * 2, 0),
new Vector(SIZE * 3, SIZE)) new Vector(SIZE * 3-1, SIZE))
.add(new Vector(SIZE * 2, SIZE * 2), .add(new Vector(SIZE * 2, SIZE * 2),
new Vector(SIZE, SIZE * 2 + SIZE2), new Vector(SIZE, SIZE * 2 + SIZE2),
new Vector(SIZE2, SIZE * 2 + SIZE2)); new Vector(SIZE2+1, SIZE * 2 + SIZE2));
} }
private static Polygon createPoly2() { private static Polygon createPoly2() {