import era.mi.logic.components.gates.NotGate;\r
import era.mi.logic.components.gates.OrGate;\r
import era.mi.logic.timeline.Timeline.ExecutionResult;\r
-import era.mi.logic.wires.WireArray;\r
+import era.mi.logic.wires.Wire;\r
\r
public class GUITest extends JPanel\r
{\r
private static final int OR_DELAY = 100;\r
private static final int NOT_DELAY = 100;\r
\r
- WireArray r = new WireArray(1, WIRE_DELAY);\r
- WireArray s = new WireArray(1, WIRE_DELAY);\r
- WireArray t1 = new WireArray(1, WIRE_DELAY);\r
- WireArray t2 = new WireArray(1, WIRE_DELAY);\r
- WireArray q = new WireArray(1, WIRE_DELAY);\r
- WireArray nq = new WireArray(1, WIRE_DELAY);\r
+ Wire r = new Wire(1, WIRE_DELAY);\r
+ Wire s = new Wire(1, WIRE_DELAY);\r
+ Wire t1 = new Wire(1, WIRE_DELAY);\r
+ Wire t2 = new Wire(1, WIRE_DELAY);\r
+ Wire q = new Wire(1, WIRE_DELAY);\r
+ Wire nq = new Wire(1, WIRE_DELAY);\r
\r
- ManualSwitch rIn = new ManualSwitch(r);\r
- ManualSwitch sIn = new ManualSwitch(s);\r
+ ManualSwitch rIn = new ManualSwitch(r.createEnd());\r
+ ManualSwitch sIn = new ManualSwitch(s.createEnd());\r
\r
- OrGate or1 = new OrGate(OR_DELAY, t2, r, nq);\r
- OrGate or2 = new OrGate(OR_DELAY, t1, s, q);\r
- NotGate not1 = new NotGate(NOT_DELAY, t2, q);\r
- NotGate not2 = new NotGate(NOT_DELAY, t1, nq);\r
+ OrGate or1 = new OrGate(OR_DELAY, t2.createEnd(), r.createEnd(), nq.createEnd());\r
+ OrGate or2 = new OrGate(OR_DELAY, t1.createEnd(), s.createEnd(), q.createEnd());\r
+ NotGate not1 = new NotGate(NOT_DELAY, t2.createEnd(), q.createEnd());\r
+ NotGate not2 = new NotGate(NOT_DELAY, t1.createEnd(), nq.createEnd());\r
\r
Map<ManualSwitch, Rectangle> switchMap = new HashMap<>();\r
\r
g.drawString(s, x - (int) (w * anchorX), y + (int) (h * anchorY));\r
}\r
\r
- private void drawWire(Graphics g, WireArray wa, String name, double x1, double y1, double x2, double y2)\r
+ private void drawWire(Graphics g, Wire wa, String name, double x1, double y1, double x2, double y2)\r
{\r
setTo(g, wa);\r
g.drawLine(gX(x1), gY(y1), gX(x2), gY(y2));\r
g.setColor(Color.BLACK);\r
}\r
\r
- private static void setTo(Graphics g, WireArray wa)\r
+ private static void setTo(Graphics g, Wire wa)\r
{\r
switch (wa.getValue())\r
{\r
case ZERO:\r
g.setColor(Color.BLACK);\r
break;\r
+ case U:\r
+ g.setColor(Color.MAGENTA);\r
+ break;\r
default:\r
throw new IllegalArgumentException();\r
}\r