diff --git a/bower.json b/bower.json index 4a6206f7..ada6e3e4 100644 --- a/bower.json +++ b/bower.json @@ -24,7 +24,8 @@ "momentjs": "~2.8.x", "objectdiff": "https://github.com/NV/objectDiff.js.git", "round-date": "~1.0.1", - "sass-bootstrap": "3.0.2" + "sass-bootstrap": "3.0.2", + "angular-loading-bar": "~0.7.1" }, "dependencies": {}, "private": true, diff --git a/src/app/d3Bindings/eventDistribution/distributionDetail.js b/src/app/d3Bindings/eventDistribution/distributionDetail.js index 02b2576f..4081b979 100644 --- a/src/app/d3Bindings/eventDistribution/distributionDetail.js +++ b/src/app/d3Bindings/eventDistribution/distributionDetail.js @@ -178,7 +178,7 @@ angular .clipPath("url(#" + clipId + ")") .classed("mainItemsGroup", true); - xAxis = new TimeAxis(main, xScale, {position: [0, mainHeight]}); + xAxis = new TimeAxis(main, xScale, {position: [0, mainHeight], isVisible: false}); } function updateDataVariables(data) { diff --git a/src/app/d3Bindings/eventDistribution/distributionOverview.js b/src/app/d3Bindings/eventDistribution/distributionOverview.js index 367c1123..0d10895c 100644 --- a/src/app/d3Bindings/eventDistribution/distributionOverview.js +++ b/src/app/d3Bindings/eventDistribution/distributionOverview.js @@ -62,7 +62,7 @@ angular updateDimensions(); mini = createMini(chart); - xAxis = new TimeAxis(mini, xScale, {position: [0, miniHeight]}); + xAxis = new TimeAxis(mini, xScale, {position: [0, miniHeight], isVisible: false}); } function updateData(data) { @@ -77,7 +77,7 @@ angular if (data && data.items.length > 0) { display(); - xAxis.update(xScale, [0, miniHeight]); + xAxis.update(xScale, [0, miniHeight], true); } } diff --git a/src/app/d3Bindings/widgets/timeAxis.js b/src/app/d3Bindings/widgets/timeAxis.js index 637c1dbb..d3aba629 100644 --- a/src/app/d3Bindings/widgets/timeAxis.js +++ b/src/app/d3Bindings/widgets/timeAxis.js @@ -14,7 +14,7 @@ angular position: [0, 0], isVisible: true }, - options = angular.extend(defaultOptions, options), + options = angular.extend(defaultOptions, _options), scale = _scale || d3.time.scale(), axisG; diff --git a/src/app/visualize/_visualize.scss b/src/app/visualize/_visualize.scss index 9378c9b2..b0aa8ebd 100644 --- a/src/app/visualize/_visualize.scss +++ b/src/app/visualize/_visualize.scss @@ -18,6 +18,15 @@ } } } + + .loadingImage { + $loadGifPath: image-url('load.gif'); + background: $loadGifPath center center no-repeat; + width: 100%; + height: 60px; + + + } } diff --git a/src/app/visualize/visualize.js b/src/app/visualize/visualize.js index 3da69643..cae54ce8 100644 --- a/src/app/visualize/visualize.js +++ b/src/app/visualize/visualize.js @@ -21,6 +21,7 @@ angular $scope.filterType = null; $scope.sites = []; $scope.projects = []; + $scope.isLoading = true; var parameters = validateParameters(); @@ -38,6 +39,8 @@ angular chain.then(sitesRetrieved) .then(getOtherData) .then(processOtherData, function error() { + $scope.isLoading = false; + if (!$scope.errorState) { $scope.errorState = "an unknown error occurred"; } @@ -81,10 +84,15 @@ angular return d.id; }, getTileUrl: function(date, category, tileSizeSeconds, tileSizePixels, datum, index) { - //var hourOfDay = date.getHours(); + var hourOfDay = date.getHours(); + + if (datum.source.id !== 188238) { + return; + } // do not attempt to load dll's for demo - return; + var url = "/assets/temp/demo/188238_" + hourOfDay + ".png"; + return url; } } }; @@ -233,6 +241,8 @@ angular function processOtherData(results) { console.debug("Visualise data promise chain success", arguments); + $scope.isLoading = false; + var projects = results[1].data.data; $scope.projects = projects; diff --git a/src/app/visualize/visualize.tpl.html b/src/app/visualize/visualize.tpl.html index bc3fb2ba..32b3ebe4 100644 --- a/src/app/visualize/visualize.tpl.html +++ b/src/app/visualize/visualize.tpl.html @@ -32,12 +32,13 @@

Audio distribution visualisation

- +

Detailed view for {{distributionOptions.detailDuration}}

+