diff ExperimentController.java @ 23:9fc8683b8fed

Fixed GUI button presses, had their background change as feedback and added ability to record responses for a probe tone at the end of a sequence

--- a/ExperimentController.java	Wed Oct 31 15:16:26 2012 +0000
+++ b/ExperimentController.java	Wed Nov 07 18:22:01 2012 +0000
@@ -117,18 +117,17 @@
                     block.addMelodyQA("known", answer1); 
                 } else 
                     block.addMelodyQA("known", "-1");
-                
                 if (exp.getAskLiking()) {
                     String answer2 = (String)(sp.getQ2Box().getSelectedItem()); 
                     block.addMelodyQA("liked", answer2); 
                 } else 
                     block.addMelodyQA("liked", "-1");
-                
                 block.storeMelodyResult();
                 results.writeResults();
                 // close the midi player
                 block.getMidiPlayer().stop();
                 // proceed to ... 
+                
                 String nextFile = block.nextFile();
                 if (nextFile == null) { 
                     boolean nb = exp.nextBlock(); 
@@ -137,6 +136,7 @@
                         gui.getInterBlockPanel().setText(); 
                         gui.getInterBlockPanel().updateMessageDisplay(); 
                         gui.showCard("interblock"); 
+                        sp.resetButtonBackgrounds();
                     } else {
                         // ... write results and subject questionnaire 
                         results.writeResults();
@@ -144,19 +144,23 @@
                     }
                 } else { 
                     // ... next melody within block
+                    sp.resetButtonBackgrounds();
                     sp.setSongNumberText(); 
                     sp.defaultAnswers(); 
                     gui.setAcceptingResponses(false); 
                     block.initialiseBlock(); 
                     exp.runExperiment(); 
+
                 }
             }
         } else { 
             JButton[] rButtons = sp.getResponseButtons(); 
             for (int i = 0; i < rButtons.length; i++) { 
+                System.out.println("getAcceptingResponses: " + gui.getAcceptingResponses());
                 if (source == rButtons[i] && (exp.isRunning() || exp.hasRun()) && gui.getAcceptingResponses()) { 
-                    block.addResponse(i+1, time); 
+                    block.addResponse(i+1, time);
                     gui.setAcceptingResponses(false); 
+                    rButtons[i].setBackground(Color.red);
                 }
             }
         }