# HG changeset patch # User Marcus Pearce # Date 1424859028 0 # Node ID 67ab1d1f9a874b6949d0d7d2fcde9b76a0d34e30 # Parent 09fcd3fbfe1eeac0fe55dbff21f66f1d525eb77d Show Clock right until midnight (not 9am). diff -r 09fcd3fbfe1e -r 67ab1d1f9a87 ExperimentGui.java --- a/ExperimentGui.java Wed Feb 25 10:10:00 2015 +0000 +++ b/ExperimentGui.java Wed Feb 25 10:10:28 2015 +0000 @@ -2,7 +2,7 @@ * File: ExperimentGui.java * Author: Marcus Pearce * Created: <2007-02-14 16:42:31 marcusp> - * Time-stamp: <2011-11-04 17:41:45 marcusp> + * Time-stamp: <2015-02-25 10:07:48 marcusp> *============================================================================= */ @@ -129,17 +129,17 @@ /* Run clock for r revolutions at a rate of 1 minute (6 degrees) * every n milliseconds. */ - public void runClock(int r, long n) { - clock.reset(); - showClock(); - for (int i = 0; i < (60 * r); i++) { - try { Thread.sleep (n); } catch (InterruptedException e) {} - clock.tick(1); - clock.repaint(); - } - try { Thread.sleep (1000); } catch (InterruptedException e) {} - showFixationPoint(); - } + //public void runClock(int r, long n) { + // clock.reset(); + // showClock(); + // for (int i = 0; i < (60 * r); i++) { + // try { Thread.sleep (n); } catch (InterruptedException e) {} + // clock.tick(1); + // clock.repaint(); + // } + // try { Thread.sleep (1000); } catch (InterruptedException e) {} + // showFixationPoint(); + //} public void debug(String message) { @@ -255,18 +255,20 @@ } else setAcceptingResponses(true); - //tick(nMinutes); - clockTicking = false; + clock.showFullClock = true; + clock.repaint(); break; case PROBE: case PROBE_EX: case PROBE_UNEX: debug("PROBE_{UN,}EX: acceptingResponses = " + acceptingResponses); - clock.showFullClock = false; + clock.showFullClock = true; clock.repaint(); break; case AFTER_PROBE: showFixationPoint(); + clock.showFullClock = false; + clockTicking = false; break; default: System.out.println("Unexpected probe id: " + probe);