changeset 3:e0bd22354f3f tip

Fixed name bug
author Geogaddi\David <d.m.ronan@qmul.ac.uk>
date Fri, 07 Jul 2017 12:34:24 +0100
parents 1254d73c5061
children
files DeMaskingLT/ListenToAudio.cs DeMaskingLT/PerceivedEmotion.cs DeMaskingLT/bin/Release/EmotionFiles.txt DeMaskingLT/bin/Release/Files.txt
diffstat 4 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/DeMaskingLT/ListenToAudio.cs	Fri Jul 07 12:24:31 2017 +0100
+++ b/DeMaskingLT/ListenToAudio.cs	Fri Jul 07 12:34:24 2017 +0100
@@ -44,7 +44,7 @@
         private int _track4CurrentValue = 0;
         private int _track5CurrentValue = 0;
 
-        private int _testNumber = 0;
+        private int _testNumber = 4;
 
         public ListenToAudio()
         {
--- a/DeMaskingLT/PerceivedEmotion.cs	Fri Jul 07 12:24:31 2017 +0100
+++ b/DeMaskingLT/PerceivedEmotion.cs	Fri Jul 07 12:34:24 2017 +0100
@@ -41,7 +41,7 @@
         public PerceivedEmotion(String name)
         {
             InitializeComponent();
-            _participantName = name;
+            _experimentData.NameOfParticipant = name;
         }
 
         private void CheckSubmitButton()
@@ -209,7 +209,7 @@
             CenterToScreen();
 
             //Create log file for Data
-            _logger = new Logging(_participantName + "_PEResults.txt", ",");
+            _logger = new Logging(_experimentData.NameOfParticipant + "_PEResults.txt", ",");
 
             string path = Directory.GetCurrentDirectory();
             path = path + "\\EmotionFiles.txt";
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DeMaskingLT/bin/Release/EmotionFiles.txt	Fri Jul 07 12:34:24 2017 +0100
@@ -0,0 +1,5 @@
+C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\In the Meantime\Alternative Mixes\Emotion
+C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\Lead Me\Alternative Mixes\Emotion
+C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\Not Alone\Alternative Mixes\Emotion
+C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\Red to Blue\Alternative Mixes\Emotion
+C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\Under a Covered Sky\Alternative Mixes\Emotion
\ No newline at end of file
--- a/DeMaskingLT/bin/Release/Files.txt	Fri Jul 07 12:24:31 2017 +0100
+++ b/DeMaskingLT/bin/Release/Files.txt	Fri Jul 07 12:34:24 2017 +0100
@@ -1,4 +1,4 @@
-C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\High Blood Pressure\Alternative Mixes\Mono
+C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\In the Meantime\Alternative Mixes\Mono
 C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\Lead Me\Alternative Mixes\Mono
 C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\Not Alone\Alternative Mixes\Mono
 C:\Users\David\Google Drive\Queen Mary Work\Bayesian Net Mixing\Experiment\Red to Blue\Alternative Mixes\Mono