diff ExperimentController.java @ 5:135338ba37ef

If scaleLength == 2, then use 'q' and 'p' to record responses
Ignore-this: 3b73439d1f5694319cf442492531243

--- a/ExperimentController.java	Thu Nov 18 11:47:32 2010 +0000
+++ b/ExperimentController.java	Thu Nov 25 11:10:53 2010 +0000
@@ -2,7 +2,7 @@
  * File:       ExperimentController.java
  * Author:     Marcus Pearce <[e-mail]>
  * Created:    <2007-12-14 12:06:10 marcusp>
- * Time-stamp: <2010-11-18 11:04:51 marcusp>
+ * Time-stamp: <2010-11-25 11:09:56 marcusp>
  *=============================================================================
  */
 
@@ -159,16 +159,25 @@
         sp = gui.getStimulusPanel();
         JButton[] rButtons = sp.getResponseButtons();
 
-        for (int i = 0; i < rButtons.length; i++) {
-            if ((exp.isRunning() || exp.hasRun()) && gui.getAcceptingResponses()) {
-                //System.out.println("Char = " + Character.forDigit(i+1, 10));
-                if (e.getKeyChar() == Character.forDigit(i+1, 10)) {
-                    //System.out.println("Got rating: " + (i + 1));
-                    block.addResponse(i+1, time);
-                    gui.setAcceptingResponses(false); 
+        if ((exp.isRunning() || exp.hasRun()) && gui.getAcceptingResponses()) {
+            if (exp.getScaleLength() == 2) {
+                char key = e.getKeyChar();                
+                switch(key) {
+                case 'q': block.addResponse(1, time); break;
+                case 'p': block.addResponse(2, time); break;
+                default: System.out.println("No Response at " + time); break;
                 }
-                //else 
-                //    block.addResponse(0, time);
+            } else {
+                for (int i = 0; i < rButtons.length; i++) {
+                    //System.out.println("Char = " + Character.forDigit(i+1, 10));
+                    if (e.getKeyChar() == Character.forDigit(i+1, 10)) {
+                        //System.out.println("Got rating: " + (i + 1));
+                        block.addResponse(i+1, time);
+                        gui.setAcceptingResponses(false); 
+                    }
+                    //else 
+                    //    block.addResponse(0, time);
+                }
             }
         }
     }