rapid scan bug fixing

QutEcoacoustics · Mar 25, 2013 · 506a5b4 · 506a5b4
1 parent 6ccab60
commit 506a5b4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 41 deletions.
diff --git a/app/assets/javascripts/angular/controllers/experiments.js b/app/assets/javascripts/angular/controllers/experiments.js
@@ -180,7 +180,7 @@
             $scope.showDoneButton = false;
             $scope.start = function () {
                 $scope.showInstructions = false;
-                $scope.stepResults.startTimeStamp = ts();
+                $scope.stepResults.preCountDownStartTimeStamp = ts();
 
                 $scope.flashes[0].show = true;
                 $scope.currentFlash = 0;
@@ -202,6 +202,7 @@
                             if ($scope.countDown == 0){
 
                                 // eventually start it!
+                                $scope.stepResults.startTimeStamp = ts();
                                 $scope.tick();
                                 $scope.focus();
                                 $timeout(function () {
@@ -255,40 +256,6 @@
                 return $scope.stepResults.speed + 's linear 0s'
             };
 
-//            var stopTicker;
-//            $scope.tick = function () {
-//                $scope.lastTick = Date.now();
-//                $scope.focus();
-//
-//                stopTicker = $timeout(function () {
-//                        if ($scope.paused) {
-//                            // exit early to disable timer
-//                            $timeout.cancel(stopTIcker);
-//                            return;
-//                        }
-//
-//                        $scope.flashes[$scope.currentFlash].show = false;
-//                        $scope.currentFlash++;
-//
-//                        $scope.focus();
-//
-//
-//                        if ($scope.currentFlash >= $scope.flashes.length) {
-//                            $scope.stepResults.endFlashesTimeStamp = (new Date()).toISOString();
-//                            $scope.showDoneButton = true;
-//                            return;
-//                        }
-//
-//                        $scope.lastTick = Date.now();
-//
-//                        $scope.flashes[$scope.currentFlash].show = true;
-//
-//                        //$scope.tick();
-//                    },
-//                    $scope.stepResults.speed * 1000
-//                );
-//            };
-
             $scope.tick = function (delay) {
                 $scope.focus();
                 $scope.lastTick = Date.now();

diff --git a/app/assets/templates/rapid_scanning_experiment.html b/app/assets/templates/rapid_scanning_experiment.html
@@ -17,7 +17,7 @@
     font-weight: bolder;
     font-family: monospace;
     color: #464646;
-    font-size: larger;
+    font-size: xx-large;
     padding-left: 0.2em;
     padding-right: 0.2em;
     padding-top: 0.1em;
@@ -307,15 +307,19 @@ <h4>{{stepResults.name}}</h4>
             <p>
                 In these images, we are looking for a specific pattern representative of a target species.
                 In this experiment we are looking for Koalas. When Koalas vocalise they produce a spectrogram that looks
-                like this (the Koala calls have green boxes drawn around them):
+                like this (the two types Koala vocalisations have green boxes drawn around them):
                 <img src="/experiment_assets/koala_demo2.jpg">
                 <br/>
                 Study this image carefully before proceeding.
             </p>
 
             <p>
-                During the experiment, press the spacebar once per spectrogram image if you see one (or more) Koala
-                vocalisations in the image.
+                During the experiment, you must choose for each flash card (spectrogram image) whether one (or more) Koala
+                vocalisations are present in the image or not.
+                <br />
+                To indicate that you have not saw any Koalas press the <em>&lt;left arrow&gt;</em> key.
+                <br />
+                To indicate that you saw one or more Koalas press the <em>&lt;right arrow&gt;</em> key.
             </p>
 
             <p>

diff --git a/public/experiment_assets/rapid_scan.json b/public/experiment_assets/rapid_scan.json
@@ -2,11 +2,13 @@
     "experiment": "Rapid Spectrogram Scanning Experiment",
     "instructions": [
         "The purpose of this experiment is to evaluate the effectiveness of mass audio data analysis using human participants",
-        "This is a timed experiment. You are encouraged to work as quickly as you can whilst maintaining accuracy",
+        "We have a lot of recorded audio and we need your help to analyse it. We want to measure how fast a participant (like you) can sift through our data to find interesting events. In this case, we will be searching for Koala calls.",
         "This experiment is designed to measure how quickly acoustic events of interest can be detected",
+        "This is a timed experiment. You are encouraged to work as quickly as you can whilst maintaining accuracy",
+
         "There are <<<<<<<<>>>>>>>>>>>> parts of this experiment to complete",
         "In total the experiment should take no longer than <<<<<<<<<<<<>>>>>>>>>>>> minutes",
-        "You should have no need for external resources during the experiment"
+        "You should have no need for external resources (images, audio recordings, or field guides) during the experiment"
     ],
     "experimentSteps": [
         {