comparison ExperimentController.java @ 30:84d943797cf2

Require rating for each melody

 //             if (!exp.isRunning() && !exp.hasRun())
 //                 exp.runExperiment(); 
 //             else 
 //                 reportError("You have already played the melody.");
         } else if (source == sp.getNextButton()) { 
-            if (!exp.hasRun() || exp.isRunning()) 
+            if (!exp.hasRun() || exp.isRunning()) {
+		//System.out.println(!exp.hasRun());
+		//System.out.println(exp.isRunning());
+		//System.out.println(exp.getCurrentBlock().getMidiPlayer().getSequencer().isRunning());
                 reportError("You haven't finished playing the melody yet."); 
-            else if (sp.unansweredQuestions())
+
+            } else if (exp.getCurrentBlock().getMelodyResults().countResponses() == 0) {
+                reportError("Please select a number."); 
+
+            } else if (sp.unansweredQuestions())
                 reportError("There are unanswered questions."); 
             else {  
                 // store results (and write to file)
                 if (exp.getAskFamiliarity()) {
                     String answer1 = (String)(sp.getQ1Box().getSelectedItem());