Mercurial > hg > mep

changeset 21:9e45ae01f81e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make final questionnaire not necessarily appear.
author Marcus Pearce <marcus.pearce@eecs.qmul.ac.uk>
date Tue, 27 Mar 2012 16:54:17 +0100
parents f0cd8f32e8c8
children 5c54f5213f3d
files StimulusPanel.class StimulusPanel.java SubjectDataPanel.class SubjectDataPanel.java runExperiment.bat
diffstat 5 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
Binary file StimulusPanel.class has changed
--- a/StimulusPanel.java	Thu Mar 01 09:39:26 2012 +0000
+++ b/StimulusPanel.java	Tue Mar 27 16:54:17 2012 +0100
@@ -2,7 +2,7 @@
  * File:       StimulusPanel.java
  * Author:     Marcus Pearce <m.pearce@gold.ac.uk>
  * Created:    <2007-12-05 11:24:00 marcusp>
- * Time-stamp: <2011-07-19 15:39:36 marcusp>
+ * Time-stamp: <2012-03-27 16:39:33 marcusp>
  *=============================================================================
  */
 
@@ -106,7 +106,7 @@
         playButton.setText("Play"); 
 
         nextButton = new JButton(new ImageIcon("Icons/StepForward24.gif"));
-        nextButton.setText("Play next melody"); 
+        nextButton.setText("Next"); 
         
         songNumberLabel = new JLabel(""); 
         setSongNumberText(); 
Binary file SubjectDataPanel.class has changed
--- a/SubjectDataPanel.java	Thu Mar 01 09:39:26 2012 +0000
+++ b/SubjectDataPanel.java	Tue Mar 27 16:54:17 2012 +0100
@@ -2,7 +2,7 @@
  * File:       SubjectDataPanel.java
  * Author:     Marcus Pearce <m.pearce@gold.ac.uk>
  * Created:    <2007-02-14 11:28:27 marcusp>
- * Time-stamp: <2012-01-25 13:27:00 marcusp>
+ * Time-stamp: <2012-03-27 16:48:33 marcusp>
  *=============================================================================
  */
 
@@ -194,8 +194,10 @@
 
 	//getRootPane().setDefaultButton(finishButton);
         this.setLayout (new BorderLayout());
-        add(topPanel, BorderLayout.NORTH); 
-	add(questionsPanel2, BorderLayout.CENTER); 
+	if (gui.getExperiment().getFinalQuestionnaire()) {
+            add(topPanel, BorderLayout.NORTH); 
+            add(questionsPanel2, BorderLayout.CENTER); 
+        }
 	add(finishPanel,BorderLayout.SOUTH); 
     } 
 
--- a/runExperiment.bat	Thu Mar 01 09:39:26 2012 +0000
+++ b/runExperiment.bat	Tue Mar 27 16:54:17 2012 +0100
@@ -1,1 +1,1 @@
-java Experiment 1 1 4 0 7 "Highly unexpected" "Highly expected" "Data/Midi/hymns/" "Data/instructions.html" "Results" 1 1 1
+java Experiment 1 1 4 0 7 "Highly unexpected" "Highly expected" "Data/Midi/hymns/120hymns/" "Data/instructions.html" "Results" 1 1 1