Fixed GUITest: WireEnds used as outputs were created as input.

[Mograsim.git] / era.mi / src / era / mi / logic / tests / GUITest.java

diff --git a/era.mi/src/era/mi/logic/tests/GUITest.java b/era.mi/src/era/mi/logic/tests/GUITest.java
index 2599b54..5610e83 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/GUITest.java
+++ b/era.mi/src/era/mi/logic/tests/GUITest.java
@@ -41,10 +41,10 @@ public class GUITest extends JPanel
        ManualSwitch rIn = new ManualSwitch(r.createEnd());
        ManualSwitch sIn = new ManualSwitch(s.createEnd());
 
-       OrGate or1 = new OrGate(OR_DELAY, t2.createEnd(), r.createEnd(), nq.createEnd());
-       OrGate or2 = new OrGate(OR_DELAY, t1.createEnd(), s.createEnd(), q.createEnd());
-       NotGate not1 = new NotGate(NOT_DELAY, t2.createEnd(), q.createEnd());
-       NotGate not2 = new NotGate(NOT_DELAY, t1.createEnd(), nq.createEnd());
+       OrGate or1 = new OrGate(OR_DELAY, t2.createEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd());
+       OrGate or2 = new OrGate(OR_DELAY, t1.createEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd());
+       NotGate not1 = new NotGate(NOT_DELAY, t2.createReadOnlyEnd(), q.createEnd());
+       NotGate not2 = new NotGate(NOT_DELAY, t1.createReadOnlyEnd(), nq.createEnd());
 
        Map<ManualSwitch, Rectangle> switchMap = new HashMap<>();
 
@@ -241,7 +241,7 @@ public class GUITest extends JPanel
                        g.setColor(Color.BLACK);
                        break;
                case U:
-                       g.setColor(Color.BLUE);
+                       g.setColor(Color.MAGENTA);
                        break;
                default:
                        throw new IllegalArgumentException();
@@ -282,7 +282,7 @@ public class GUITest extends JPanel
                                gt.repaint(12);
                        try
                        {
-                               Thread.sleep(Math.max(16 - System.currentTimeMillis() + lastFrame, 0));
+                               Thread.sleep(Math.max(updateT - System.currentTimeMillis() + lastFrame, 0));
                        }
                        catch (Exception e)
                        {