WireCrossPoint cpB2 = new WireCrossPoint(submodelModifiable, 1);
WireCrossPoint cpB3 = new WireCrossPoint(submodelModifiable, 1);
- nandA1.moveCenterTo(20, 2.5);
- nandB1.moveCenterTo(20, 27.5);
- nandA2.moveCenterTo(20, 52.5);
- nandB2.moveCenterTo(20, 77.5);
- nandA3.moveCenterTo(20, 102.5);
- nandB3.moveCenterTo(20, 127.5);
- nandA4.moveCenterTo(20, 152.5);
- nandB4.moveCenterTo(20, 177.5);
- nandY1.moveCenterTo(65, 2.5);
- nandY2.moveCenterTo(65, 27.5);
- nandY3.moveCenterTo(65, 52.5);
- nandY4.moveCenterTo(65, 77.5);
+ nandA1.moveTo(20, 2.5);
+ nandB1.moveTo(20, 27.5);
+ nandA2.moveTo(20, 52.5);
+ nandB2.moveTo(20, 77.5);
+ nandA3.moveTo(20, 102.5);
+ nandB3.moveTo(20, 127.5);
+ nandA4.moveTo(20, 152.5);
+ nandB4.moveTo(20, 177.5);
+ nandY1.moveTo(65, 2.5);
+ nandY2.moveTo(65, 27.5);
+ nandY3.moveTo(65, 52.5);
+ nandY4.moveTo(65, 77.5);
cpA1.moveCenterTo(7.5, 17.5);
cpB1.moveCenterTo(5, 42.5);
cpA2.moveCenterTo(7.5, 67.5);
cpB2.moveCenterTo(5, 92.5);
cpA3.moveCenterTo(7.5, 117.5);
cpB3.moveCenterTo(5, 142.5);
- Point a4 = new Point(7.5, 167.5);
- Point b4 = new Point(5, 192.5);
new GUIWire(submodelModifiable, A1, nandA1.getInputPins().get(0), new Point(15, 62.5), new Point(15, 7.5));
new GUIWire(submodelModifiable, A2, nandA2.getInputPins().get(0), new Point(17.5, 87.5), new Point(17.5, 57.5));
new GUIWire(submodelModifiable, cpA2, cpA3);
new GUIWire(submodelModifiable, cpA2, nandA2.getInputPins().get(1));
new GUIWire(submodelModifiable, cpA3, nandA3.getInputPins().get(1));
- new GUIWire(submodelModifiable, cpA3, nandA4.getInputPins().get(1), a4);
+ new GUIWire(submodelModifiable, cpA3, nandA4.getInputPins().get(1), new Point(7.5, 167.5));
new GUIWire(submodelModifiable, cpB1, cpB2);
new GUIWire(submodelModifiable, cpB1, nandB1.getInputPins().get(1));
new GUIWire(submodelModifiable, cpB2, cpB3);
new GUIWire(submodelModifiable, cpB2, nandB2.getInputPins().get(1));
new GUIWire(submodelModifiable, cpB3, nandB3.getInputPins().get(1));
- new GUIWire(submodelModifiable, cpB3, nandB4.getInputPins().get(1), b4);
- new GUIWire(submodelModifiable, nandA1.getOutputPin(), nandY1.getInputPins().get(0), new Point(40, 12.5), new Point(40, 7.5));
- new GUIWire(submodelModifiable, nandB1.getOutputPin(), nandY1.getInputPins().get(1), new Point(40, 37.5), new Point(40, 17.5));
- new GUIWire(submodelModifiable, nandA2.getOutputPin(), nandY2.getInputPins().get(0), new Point(42.5, 62.5), new Point(42.5, 32.5));
- new GUIWire(submodelModifiable, nandB2.getOutputPin(), nandY2.getInputPins().get(1), new Point(45, 87.5), new Point(45, 42.5));
- new GUIWire(submodelModifiable, nandA3.getOutputPin(), nandY3.getInputPins().get(0), new Point(47.5, 112.5), new Point(47.5, 57.5));
- new GUIWire(submodelModifiable, nandB3.getOutputPin(), nandY3.getInputPins().get(1), new Point(50, 137.5), new Point(50, 67.5));
- new GUIWire(submodelModifiable, nandA4.getOutputPin(), nandY4.getInputPins().get(0), new Point(52.5, 162.5), new Point(52.5, 82.5));
- new GUIWire(submodelModifiable, nandB4.getOutputPin(), nandY4.getInputPins().get(1), new Point(55, 187.5), new Point(55, 92.5));
+ new GUIWire(submodelModifiable, cpB3, nandB4.getInputPins().get(1), new Point(5, 192.5));
+ new GUIWire(submodelModifiable, nandA1.getOutputPin(), nandY1.getInputPins().get(0), new Point(42.5, 12.5), new Point(42.5, 7.5));
+ new GUIWire(submodelModifiable, nandB1.getOutputPin(), nandY1.getInputPins().get(1), new Point(45, 37.5), new Point(45, 17.5));
+ new GUIWire(submodelModifiable, nandA2.getOutputPin(), nandY2.getInputPins().get(0), new Point(47.5, 62.5), new Point(47.5, 32.5));
+ new GUIWire(submodelModifiable, nandB2.getOutputPin(), nandY2.getInputPins().get(1), new Point(50, 87.5), new Point(50, 42.5));
+ new GUIWire(submodelModifiable, nandA3.getOutputPin(), nandY3.getInputPins().get(0), new Point(52.5, 112.5), new Point(52.5, 57.5));
+ new GUIWire(submodelModifiable, nandB3.getOutputPin(), nandY3.getInputPins().get(1), new Point(55, 137.5), new Point(55, 67.5));
+ new GUIWire(submodelModifiable, nandA4.getOutputPin(), nandY4.getInputPins().get(0), new Point(57.5, 162.5), new Point(57.5, 82.5));
+ new GUIWire(submodelModifiable, nandB4.getOutputPin(), nandY4.getInputPins().get(1), new Point(60, 187.5), new Point(60, 92.5));
new GUIWire(submodelModifiable, nandY1.getOutputPin(), Y1, new Point[0]);
new GUIWire(submodelModifiable, nandY2.getOutputPin(), Y2, new Point[0]);
new GUIWire(submodelModifiable, nandY3.getOutputPin(), Y3, new Point[0]);