Fixed indexing of secondary stimuli in log files, added more log item…

…s (answer_correct, answer_incorrect, hit_floor, hit_ceiling, reached_maximum_floor_ceiling_hits), added count to ignored_response log item.
davidlawson · Aug 6, 2016 · a80dc71 · a80dc71
1 parent 0946d6c
commit a80dc71
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/PsyPad/Supporting Files/PsyPad-Info.plist b/PsyPad/Supporting Files/PsyPad-Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>27</string>
+	<string>28</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/PsyPad/Test/TestViewController.h b/PsyPad/Test/TestViewController.h
@@ -55,6 +55,7 @@
 @property (weak, nonatomic) IBOutlet UIImageView *overlayImageView;
 @property (nonatomic) int overlayIndex;
 @property (nonatomic) int secondaryPressedIndex;
+@property (nonatomic) int ignoredCount;
 
 - (IBAction)beginConfiguration;
 - (IBAction)pressExitButton:(id)sender;

diff --git a/PsyPad/Test/TestViewController.m b/PsyPad/Test/TestViewController.m
@@ -238,6 +238,8 @@ - (IBAction)beginConfiguration
     self.view.backgroundColor = [UIColor colorWithHexString:self.currentConfiguration.background_colour];
     UIImage *bgImage = self.currentConfiguration.sequence.backgroundImage;
     self.backgroundImageView.image = bgImage;
+
+    self.ignoredCount = 0;
 
     if (self.currentConfiguration.show_exit_buttonValue)
     {
@@ -402,7 +404,8 @@ - (void)pressTestButton:(id)sender
 
     if (self.currentConfiguration.enable_secondary_stimuliValue && self.overlayIndex != self.secondaryPressedIndex)
     {
-        [self log:@"ignored_response" info:nil];
+        self.ignoredCount++;
+        [self log:@"ignored_response" info:@"%d", self.ignoredCount];
 
         if (!self.currentConfiguration.use_staircase_methodValue)
         {
@@ -432,6 +435,8 @@ - (void)pressTestButton:(id)sender
             self.currentStaircase.numTimesIncorrect = 0;
 
             [self playAudio:self.correctAudioPlayer];
+
+            [self log:@"answer_correct" info:nil];
         }
         else
         {
@@ -441,20 +446,28 @@ - (void)pressTestButton:(id)sender
             self.currentStaircase.numTimesCorrect = 0;
 
             [self playAudio:self.incorrectAudioPlayer];
+
+            [self log:@"answer_incorrect" info:nil];
         }
 
         if (answerCorrect && self.currentStaircase.currentLevel == self.currentStaircase.minLevel)
         {
             self.currentStaircase.numHitsFloor++;
+
+            [self log:@"hit_floor" info:nil];
         }
         else if (!answerCorrect && self.currentStaircase.currentLevel == self.currentStaircase.maxLevel)
         {
             self.currentStaircase.numHitsCeiling++;
+
+            [self log:@"hit_ceiling" info:nil];
         }
 
         if (self.currentStaircase.numHitsFloor == self.currentStaircase.floorCeilingHits
             || self.currentStaircase.numHitsCeiling == self.currentStaircase.floorCeilingHits)
         {
+            [self log:@"reached_maximum_floor_ceiling_hits" info:nil];
+
             [self.staircases removeObject:self.currentStaircase];
             self.currentStaircase = nil;
             [self prepareNextQuestion];
@@ -521,10 +534,14 @@ - (void)pressTestButton:(id)sender
         if ([[imageButton.dbImage.name substringToIndex:2] isEqualToString:[NSString stringWithFormat:@"%d_", pressedButton.number]])
         {
             [self playAudio:self.correctAudioPlayer];
+
+            [self log:@"answer_correct" info:nil];
         }
         else
         {
             [self playAudio:self.incorrectAudioPlayer];
+
+            [self log:@"answer_incorrect" info:nil];
         }
     }
 
@@ -610,7 +627,7 @@ - (void)showSecondaryStimuli
                 break;
         }
         [self.view bringSubviewToFront:self.overlayImageView];
-        [self log:@"presented_secondary_image" info:@"%d", self.overlayIndex];
+        [self log:@"presented_secondary_image" info:@"%d", self.overlayIndex + 1];
     }
 }