Skip to content

Commit

Permalink
More work on Virtual Bird Tour. Downloaded media since the site was t…
Browse files Browse the repository at this point in the history
…oo slow :(
  • Loading branch information
Mark Cottman-Fields committed Apr 8, 2013
1 parent d2b958b commit 026f323
Show file tree
Hide file tree
Showing 132 changed files with 1,025 additions and 167 deletions.
11 changes: 8 additions & 3 deletions app/assets/javascripts/angular/controllers/experiments.js
Original file line number Diff line number Diff line change
Expand Up @@ -660,8 +660,10 @@
//=================

var BASE_SPECTROGRAM_URL = "http://sensor.mquter.qut.edu.au/Spectrogram.ashx?ID={0}&start={1}&end={2}";
var BASE_LOCAL_SPECTROGRAM_URL = "/experiment_assets/bird_tour/media/{0}_{1}_{2}.jpg";

var BASE_EXTERNAL_AUDIO_URL = "http://sensor.mquter.qut.edu.au/AudioReading.ashx?ID={0}&Type={3}&start={1}&end={2}";
var BASE_LOCAL_AUDIO_URL = "/experiment_assets/bird_tour/audio/{0}_{1}_{2}.{3}"; // for webm
var BASE_LOCAL_AUDIO_URL = "/experiment_assets/bird_tour/media/{0}_{1}_{2}.{3}"; // for webm

var STEP_TYPE_TRANSITION = 'transition';
var STEP_TYPE_ACTIVITY = 'activity';
Expand Down Expand Up @@ -854,8 +856,11 @@
};

$scope.getItemToVerifyForSpecies = function (speciesCommonName) {

var speciesInfo = $scope.getSpeciesInfo(speciesCommonName);

var annotations = angular.copy($scope.annotations.filter(function (element, index, array) {
return element.type == ANNOTATION_TYPE_TO_VERIFY && element.speciesCommonName == speciesCommonName;
return element.type == ANNOTATION_TYPE_TO_VERIFY && speciesInfo.annotationIds.indexOf(element.id) !== -1;
}));

$scope.addMediaUrlsToAnnotations(annotations);
Expand Down Expand Up @@ -885,7 +890,7 @@
var startMs = Math.max(0, value.offsetStart - SPECTROGRAM_PADDING_MS);
var endMs = value.offsetEnd + SPECTROGRAM_PADDING_MS;

value.spectrogramImage = String.format(BASE_SPECTROGRAM_URL, value.audioId, startMs, endMs);
value.spectrogramImage = String.format(BASE_LOCAL_SPECTROGRAM_URL, value.audioId, startMs, endMs);
value.audioWebm = String.format(BASE_LOCAL_AUDIO_URL, value.audioId, startMs, endMs, 'webm');
value.audioOga = String.format(BASE_EXTERNAL_AUDIO_URL, value.audioId, startMs, endMs, 'ogg');
value.audioMp3 = String.format(BASE_EXTERNAL_AUDIO_URL, value.audioId, startMs, endMs, 'mp3');
Expand Down
1,126 changes: 1,005 additions & 121 deletions public/experiment_assets/bird_tour.json

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
33 changes: 1 addition & 32 deletions public/experiment_assets/bird_tour_annotation_counts.json
Original file line number Diff line number Diff line change
@@ -1,32 +1 @@
{
"1021503": {
"no": 0,
"yes": 2,
"unsure": 0,
"total": 2
},
"102150": {
"no": 1,
"yes": 1,
"unsure": 0,
"total": 2
},
"1021504": {
"no": 1,
"yes": 1,
"unsure": 0,
"total": 2
},
"1021501": {
"no": 0,
"yes": 2,
"unsure": 0,
"total": 2
},
"1021502": {
"no": 0,
"yes": 1,
"unsure": 1,
"total": 2
}
}
{}
22 changes: 11 additions & 11 deletions public/experiment_assets/bird_tour_counts.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"locations": {
"ABC": {
"count": 1,
"count": 0,
"locations": [
"A",
"B",
Expand All @@ -17,31 +17,31 @@
]
},
"CAB": {
"count": 1,
"count": 0,
"locations": [
"C",
"A",
"B"
]
},
"ACB": {
"count": 1,
"count": 0,
"locations": [
"A",
"C",
"B"
]
},
"BAC": {
"count": 1,
"count": 0,
"locations": [
"B",
"A",
"C"
]
},
"CBA": {
"count": 1,
"count": 0,
"locations": [
"C",
"B",
Expand All @@ -52,14 +52,14 @@
"species": {
"A": {
"12": {
"count": 1,
"count": 0,
"species": [
1,
2
]
},
"21": {
"count": 1,
"count": 0,
"species": [
2,
1
Expand All @@ -68,14 +68,14 @@
},
"B": {
"12": {
"count": 1,
"count": 0,
"species": [
1,
2
]
},
"21": {
"count": 1,
"count": 0,
"species": [
2,
1
Expand All @@ -84,14 +84,14 @@
},
"C": {
"12": {
"count": 1,
"count": 0,
"species": [
1,
2
]
},
"21": {
"count": 1,
"count": 0,
"species": [
2,
1
Expand Down
Binary file modified vendor/bin/ffmpeg/windows/ffmpeg.exe
Binary file not shown.
Binary file modified vendor/bin/ffmpeg/windows/ffprobe.exe
Binary file not shown.

0 comments on commit 026f323

Please sign in to comment.