Mercurial > hg > mep

changeset 51:67ab1d1f9a87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show Clock right until midnight (not 9am).
author Marcus Pearce <marcus.pearce@eecs.qmul.ac.uk>
date Wed, 25 Feb 2015 10:10:28 +0000
parents 09fcd3fbfe1e
children 76e99859bdb4
files ExperimentGui.java
diffstat 1 files changed, 17 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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 <m.pearce@gold.ac.uk>
  * 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);