From 967b3fb0be494b277b05f461e775856c6d5f2418 Mon Sep 17 00:00:00 2001 From: Anthony Truskinger Date: Wed, 31 Dec 2014 16:28:17 +1000 Subject: [PATCH] Wired up routing --- src/app/app.js | 10 +++++- src/app/demo/rendering.js | 4 +-- src/app/visualize/_visualize.scss | 3 -- src/app/visualize/visualize.js | 11 ++++++ src/app/visualize/visualize.tpl.html | 52 ++++++++++++++++++++++++++++ src/baw.configuration.tpl.js | 6 ++-- 6 files changed, 78 insertions(+), 8 deletions(-) diff --git a/src/app/app.js b/src/app/app.js index 8828e6ab..ac98c369 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -109,7 +109,8 @@ var app = angular.module('baw', 'bawApp.search', 'bawApp.tags', 'bawApp.users', - 'bawApp.birdWalks' + 'bawApp.birdWalks', + "bawApp.visualize" ]) .config(['$routeProvider', '$locationProvider', '$httpProvider', 'conf.paths', 'conf.constants', '$sceDelegateProvider', 'growlProvider', 'localStorageServiceProvider', "$urlProvider", "casingTransformers", @@ -172,6 +173,13 @@ var app = angular.module('baw', when('/demo/rendering', {templateUrl: paths.site.files.demo.rendering, controller: 'RenderingCtrl', title: 'Rendering' , fullWidth: true }). when('/demo/BDCloud2014', {templateUrl: paths.site.files.demo.bdCloud2014, controller: 'BdCloud2014Ctrl', title: 'BDCloud2014 demo' , fullWidth: true }). + when(paths.site.ngRoutes.visualize, { + templateUrl: paths.site.files.visualize, + controller: "VisualizeController", + title: "Visualize audio distribution", + fullWidth: true + }). + // missing route page when('/', {templateUrl: paths.site.files.home, controller: 'HomeCtrl'}). when('/404', {templateUrl: paths.site.files.error404, controller: 'ErrorCtrl'}). diff --git a/src/app/demo/rendering.js b/src/app/demo/rendering.js index 7ac208c8..9c00dbc4 100644 --- a/src/app/demo/rendering.js +++ b/src/app/demo/rendering.js @@ -138,7 +138,7 @@ angular.module("bawApp.demo.rendering", []) //. "C:\Program Files\ImageMagick-6.9.0-Q16\convert.exe" -crop 1435x1@ .\eabad986-56d9-47b5-bec6-47458ffd3eae_101023-0000.ACI-ENT-EVN-trimmed72.png tiles/tile_%d.png $scope.loadTiles60 = function () { $scope.tiles60 = []; - tileStart = performance.now() + tileStart = performance.now(); for (var i = min60; i < max60; i++) { // i == minute of day if (i % 60) { @@ -152,7 +152,7 @@ angular.module("bawApp.demo.rendering", []) if (tileCount >= 24) { $scope.tileLoadTime = Math.round(performance.now() - tileStart); } - } + }; } ] diff --git a/src/app/visualize/_visualize.scss b/src/app/visualize/_visualize.scss index 87355270..e69de29b 100644 --- a/src/app/visualize/_visualize.scss +++ b/src/app/visualize/_visualize.scss @@ -1,3 +0,0 @@ -dddddddd { - -} \ No newline at end of file diff --git a/src/app/visualize/visualize.js b/src/app/visualize/visualize.js index e69de29b..b7554213 100644 --- a/src/app/visualize/visualize.js +++ b/src/app/visualize/visualize.js @@ -0,0 +1,11 @@ +angular + .module("bawApp.visualize", []) + .controller( + "VisualizeController", + [ + "$scope", + function($scope) { + + } + ] +); \ No newline at end of file diff --git a/src/app/visualize/visualize.tpl.html b/src/app/visualize/visualize.tpl.html index e69de29b..80e2c83b 100644 --- a/src/app/visualize/visualize.tpl.html +++ b/src/app/visualize/visualize.tpl.html @@ -0,0 +1,52 @@ +
+

Audio distribution visualisation

+ Current filter: e.g. Project 341 + +
+

Large scale

+

+ year's long view of data with "selector" +

+
+ +
+

Detail

+

+ selector's length of data +

    + for each project +
  1. +
      + for each site +
    1. + list meta data +
    2. +
    3. + list meta data +
    4. +
    5. + list meta data +
    6. +
    +
  2. +
+

+
+ +
+

Day

+

+ 24 hours long, + two sections + +

+
+
+ meta data tracks +
+
+ false color spectrogram +
+
+
+
\ No newline at end of file diff --git a/src/baw.configuration.tpl.js b/src/baw.configuration.tpl.js index fb520e03..94d4679a 100644 --- a/src/baw.configuration.tpl.js +++ b/src/baw.configuration.tpl.js @@ -106,14 +106,16 @@ angular.module('bawApp.configuration', ['url']) d3: 'demo/d3TestPage.tpl.html', rendering: 'demo/rendering.tpl.html', bdCloud2014: 'demo/BDCloud2014Demo.tpl.html' - } + }, + visualize: "visualize/visualize.tpl.html" }, // routes used by angular ngRoutes: { recentRecordings: "/listen", listen: "/listen/{recordingId}", library: "/library", - libraryItem: "/library/{recordingId}/audio_events/{audioEventId}" + libraryItem: "/library/{recordingId}/audio_events/{audioEventId}", + visualize: "/visualize" }, // general links for use in 's links: {