Completion of ReadEnd and ReadWriteEnd addition
[Mograsim.git] / era.mi / src / era / mi / logic / tests / GUITest.java
index adc1b21..a135e58 100644 (file)
@@ -20,9 +20,10 @@ import era.mi.logic.components.ManualSwitch;
 import era.mi.logic.components.gates.NotGate;
 import era.mi.logic.components.gates.OrGate;
 import era.mi.logic.timeline.Timeline.ExecutionResult;
-import era.mi.logic.wires.WireArray;
+import era.mi.logic.wires.Wire;
 
-public class GUITest extends JPanel {
+public class GUITest extends JPanel
+{
 
        private static final long serialVersionUID = 1L;
 
@@ -30,20 +31,20 @@ public class GUITest extends JPanel {
        private static final int OR_DELAY = 100;
        private static final int NOT_DELAY = 100;
 
-       WireArray r = new WireArray(1, WIRE_DELAY);
-       WireArray s = new WireArray(1, WIRE_DELAY);
-       WireArray t1 = new WireArray(1, WIRE_DELAY);
-       WireArray t2 = new WireArray(1, WIRE_DELAY);
-       WireArray q = new WireArray(1, WIRE_DELAY);
-       WireArray nq = new WireArray(1, WIRE_DELAY);
+       Wire r = new Wire(1, WIRE_DELAY);
+       Wire s = new Wire(1, WIRE_DELAY);
+       Wire t1 = new Wire(1, WIRE_DELAY);
+       Wire t2 = new Wire(1, WIRE_DELAY);
+       Wire q = new Wire(1, WIRE_DELAY);
+       Wire nq = new Wire(1, WIRE_DELAY);
 
-       ManualSwitch rIn = new ManualSwitch(r);
-       ManualSwitch sIn = new ManualSwitch(s);
+       ManualSwitch rIn = new ManualSwitch(r.createReadWriteEnd());
+       ManualSwitch sIn = new ManualSwitch(s.createReadWriteEnd());
 
-       OrGate or1 = new OrGate(OR_DELAY, t2, r, nq);
-       OrGate or2 = new OrGate(OR_DELAY, t1, s, q);
-       NotGate not1 = new NotGate(NOT_DELAY, t2, q);
-       NotGate not2 = new NotGate(NOT_DELAY, t1, nq);
+       OrGate or1 = new OrGate(OR_DELAY, t2.createReadWriteEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd());
+       OrGate or2 = new OrGate(OR_DELAY, t1.createReadWriteEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd());
+       NotGate not1 = new NotGate(NOT_DELAY, t2.createReadOnlyEnd(), q.createReadWriteEnd());
+       NotGate not2 = new NotGate(NOT_DELAY, t1.createReadOnlyEnd(), nq.createReadWriteEnd());
 
        Map<ManualSwitch, Rectangle> switchMap = new HashMap<>();
 
@@ -51,13 +52,18 @@ public class GUITest extends JPanel {
        int width;
        boolean sizeChanged;
 
-       public GUITest() {
-               addMouseListener(new MouseListener() {
+       public GUITest()
+       {
+               addMouseListener(new MouseListener()
+               {
 
                        @Override
-                       public void mouseReleased(MouseEvent e) {
-                               for (Entry<ManualSwitch, Rectangle> dim : switchMap.entrySet()) {
-                                       if (dim.getValue().contains(e.getPoint())) {
+                       public void mouseReleased(MouseEvent e)
+                       {
+                               for (Entry<ManualSwitch, Rectangle> dim : switchMap.entrySet())
+                               {
+                                       if (dim.getValue().contains(e.getPoint()))
+                                       {
                                                dim.getKey().switchOff();
                                                repaint();
                                        }
@@ -65,9 +71,12 @@ public class GUITest extends JPanel {
                        }
 
                        @Override
-                       public void mousePressed(MouseEvent e) {
-                               for (Entry<ManualSwitch, Rectangle> dim : switchMap.entrySet()) {
-                                       if (dim.getValue().contains(e.getPoint())) {
+                       public void mousePressed(MouseEvent e)
+                       {
+                               for (Entry<ManualSwitch, Rectangle> dim : switchMap.entrySet())
+                               {
+                                       if (dim.getValue().contains(e.getPoint()))
+                                       {
                                                dim.getKey().switchOn();
                                                repaint();
                                        }
@@ -75,17 +84,20 @@ public class GUITest extends JPanel {
                        }
 
                        @Override
-                       public void mouseExited(MouseEvent e) {
+                       public void mouseExited(MouseEvent e)
+                       {
                                // none
                        }
 
                        @Override
-                       public void mouseEntered(MouseEvent e) {
+                       public void mouseEntered(MouseEvent e)
+                       {
                                // none
                        }
 
                        @Override
-                       public void mouseClicked(MouseEvent e) {
+                       public void mouseClicked(MouseEvent e)
+                       {
                                // If you want toggle buttons, use this code instead
 //                             for (Entry<ManualSwitch, Rectangle> dim : switchMap.entrySet()) {
 //                                     if (dim.getValue().contains(e.getPoint())) {
@@ -98,7 +110,8 @@ public class GUITest extends JPanel {
        }
 
        @Override
-       public void paint(Graphics some_g) {
+       public void paint(Graphics some_g)
+       {
                super.paint(some_g);
                Graphics2D g = ((Graphics2D) some_g);
                g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP);
@@ -142,31 +155,37 @@ public class GUITest extends JPanel {
                drawString(g, "Hint: drag the cursor out of the pressed switch to keep it's state", 5, 0, 0.0, 1.0);
        }
 
-       private void checkSizeChange() {
+       private void checkSizeChange()
+       {
                sizeChanged = height != getHeight() || width != getWidth();
-               if (sizeChanged) {
+               if (sizeChanged)
+               {
                        height = getHeight();
                        width = getWidth();
                }
        }
 
-       private void adaptFont(Graphics g) {
+       private void adaptFont(Graphics g)
+       {
                g.setFont(g.getFont().deriveFont(Math.min(height, width) / 40f));
        }
 
-       private void drawString(Graphics g, String s, int x, int y, double anchorX, double anchorY) {
+       private void drawString(Graphics g, String s, int x, int y, double anchorX, double anchorY)
+       {
                int h = g.getFontMetrics().getAscent();
                int w = g.getFontMetrics().stringWidth(s);
                g.drawString(s, x - (int) (w * anchorX), y + (int) (h * anchorY));
        }
 
-       private void drawWire(Graphics g, WireArray wa, String name, double x1, double y1, double x2, double y2) {
+       private void drawWire(Graphics g, Wire wa, String name, double x1, double y1, double x2, double y2)
+       {
                setTo(g, wa);
                g.drawLine(gX(x1), gY(y1), gX(x2), gY(y2));
                drawString(g, name, (gX(x1) + gX(x2)) / 2, (gY(y1) + gY(y2)) / 2 - 5, 0, 0);
        }
 
-       private void drawSquare(Graphics g, int posX, int posY, String text) {
+       private void drawSquare(Graphics g, int posX, int posY, String text)
+       {
                int x1 = gX(posX) - 5;
                int x2 = gX(posX + 1) + 5;
                int y1 = gY(posY) - 5;
@@ -180,14 +199,15 @@ public class GUITest extends JPanel {
 
        }
 
-       private void drawSwitch(Graphics g, ManualSwitch ms, String text, double posX1, double posY1, double posX2,
-                       double posY2) {
+       private void drawSwitch(Graphics g, ManualSwitch ms, String text, double posX1, double posY1, double posX2, double posY2)
+       {
                int x1 = gX(posX1) - 5;
                int x2 = gX(posX2) + 5;
                int y1 = gY(posY1) - 5;
                int y2 = gY(posY2) + 5;
 
-               if (sizeChanged) {
+               if (sizeChanged)
+               {
                        Rectangle r = new Rectangle(x1, y1, x2 - x1, y2 - y1);
                        switchMap.put(ms, r);
                }
@@ -199,12 +219,15 @@ public class GUITest extends JPanel {
                drawString(g, text, (x1 + x2) / 2, (y1 + y2) / 2, 0.5, 0.5);
        }
 
-       private static void setBlack(Graphics g) {
+       private static void setBlack(Graphics g)
+       {
                g.setColor(Color.BLACK);
        }
 
-       private static void setTo(Graphics g, WireArray wa) {
-               switch (wa.getValue()) {
+       private static void setTo(Graphics g, Wire wa)
+       {
+               switch (wa.getValue())
+               {
                case ONE:
                        g.setColor(Color.GREEN);
                        break;
@@ -217,20 +240,26 @@ public class GUITest extends JPanel {
                case ZERO:
                        g.setColor(Color.BLACK);
                        break;
+               case U:
+                       g.setColor(Color.MAGENTA);
+                       break;
                default:
                        throw new IllegalArgumentException();
                }
        }
 
-       private int gY(double pos) {
+       private int gY(double pos)
+       {
                return (int) (pos * height / 11);
        }
 
-       private int gX(double pos) {
+       private int gX(double pos)
+       {
                return (int) (pos * width / 11) + 50;
        }
 
-       public static void main(String[] args) {
+       public static void main(String[] args)
+       {
                JFrame f = new JFrame("Test circuit 1.0.0");
                GUITest gt = new GUITest();
                f.add(gt);
@@ -244,15 +273,19 @@ public class GUITest extends JPanel {
                long lastFrame = begin;
                long updateT = 16;
 
-               while (f.isVisible()) {
+               while (f.isVisible())
+               {
                        ExecutionResult er = Simulation.TIMELINE.executeUpTo((lastFrame - begin) * 3, lastFrame + 14);
 //                             if (Simulation.TIMELINE.hasNext()) 
 //                             Simulation.TIMELINE.executeNext();
                        if (er != ExecutionResult.NOTHING_DONE)
                                gt.repaint(12);
-                       try {
-                               Thread.sleep(Math.max(16 - System.currentTimeMillis() + lastFrame, 0));
-                       } catch (Exception e) {
+                       try
+                       {
+                               Thread.sleep(Math.max(updateT - System.currentTimeMillis() + lastFrame, 0));
+                       }
+                       catch (Exception e)
+                       {
                                e.printStackTrace();
                        }
                        lastFrame = System.currentTimeMillis();