From 7ed7c657553e8da7f2f9fef77171acd8a28317e2 Mon Sep 17 00:00:00 2001 From: Anthony Truskinger Date: Fri, 9 Jan 2015 15:45:22 +1000 Subject: [PATCH] Further work on visulization --- src/app/d3Bindings/d3.js | 4 +++- .../eventDistribution/distributionOverview.js | 23 +++++++++++++++++++ .../eventDistributionController.js | 10 ++++++++ src/app/visualize/visualize.js | 3 ++- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 src/app/d3Bindings/eventDistribution/eventDistributionController.js diff --git a/src/app/d3Bindings/d3.js b/src/app/d3Bindings/d3.js index 3b37fa45..46097c52 100644 --- a/src/app/d3Bindings/d3.js +++ b/src/app/d3Bindings/d3.js @@ -4,6 +4,8 @@ angular.module("bawApp.d3", [ "bawApp.d3.dotView", "bawApp.d3.terrainView", "bawApp.d3.timelineView", + "bawApp.d3.eventDistribution.distributionOverview", "bawApp.d3.eventDistribution.distributionDetail", - "bawApp.d3.eventDistribution.distributionOverview" + "bawApp.d3.eventDistribution.distributionController" + ]); \ No newline at end of file diff --git a/src/app/d3Bindings/eventDistribution/distributionOverview.js b/src/app/d3Bindings/eventDistribution/distributionOverview.js index 1f4bdfc9..2654845a 100644 --- a/src/app/d3Bindings/eventDistribution/distributionOverview.js +++ b/src/app/d3Bindings/eventDistribution/distributionOverview.js @@ -11,7 +11,30 @@ angular "eventDistributionOverview", [ function () { + // main functions + function setUp(element, data) { + + } + + + + // directive definition object + return { + restrict: "EA", + scope: { + data: "=" + }, + link: function($scope, $element, attributes, controller, transcludeFunction) { + + var element = $element[0]; + + + + }, + controller:"distributionController" + + } } ] ); \ No newline at end of file diff --git a/src/app/d3Bindings/eventDistribution/eventDistributionController.js b/src/app/d3Bindings/eventDistribution/eventDistributionController.js new file mode 100644 index 00000000..f9c44a28 --- /dev/null +++ b/src/app/d3Bindings/eventDistribution/eventDistributionController.js @@ -0,0 +1,10 @@ +angular + .module("bawApp.d3.eventDistribution.distributionController", []) + .controller( + "distributionController", + [ + "$scope", + function($scope, $element, $attrs) { + + } + ]); \ No newline at end of file diff --git a/src/app/visualize/visualize.js b/src/app/visualize/visualize.js index 8ed8b256..cb749f8c 100644 --- a/src/app/visualize/visualize.js +++ b/src/app/visualize/visualize.js @@ -7,7 +7,7 @@ angular "$http", function($scope, $http) { - // testing + // testing data $scope.recordingData = {}; $http.get("assets/temp/dummyData.json").then(function(response) { $scope.recordingData = response.data; @@ -17,6 +17,7 @@ angular + // gridlines $scope.gridConfig = {