diff options
-rw-r--r-- | app/index.html | 7 | ||||
-rw-r--r-- | app/js/directives.js | 1 | ||||
-rw-r--r-- | app/js/filters.js | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/app/index.html b/app/index.html index 843df21..b80ae96 100644 --- a/app/index.html +++ b/app/index.html @@ -7,6 +7,7 @@ <script type="text/javascript" src="lib/paper-full.js"></script> <script src="lib/angular.js"></script> <script src="js/app.js" ></script> + <script src="js/filters.js" ></script> <script src="js/services.js" ></script> <script src="js/directives.js" ></script> <script src="js/controllers.js" ></script> @@ -17,7 +18,11 @@ <div class="world" style="width: 100%; height: 500px;"> <div data-pg-line="line" class="line" resize></div> - <div data-ng-repeat="point in points" data-pg-draggable="point" class="point" style="top: {{point.x}}px; left: {{point.y}}px;" data-ng-class="{selected: point.selected==true}"><div></div></div> + <div data-ng-repeat="point in points" data-pg-draggable="point" class="point" style="top: {{point.y}}px; left: {{point.x}}px;" data-ng-class="{selected: point.selected==true}"><div></div></div> + + <div data-ng-repeat="point in points | filter:{selected:true} | sliding2">{{point[0].x}}, {{point[1].x}}</div> + + </div> <ul> diff --git a/app/js/directives.js b/app/js/directives.js index 4bdd45b..c794254 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -46,6 +46,7 @@ app.directive('pgLine', function () { }; mainTool.onMouseMove = function(event) { + console.log(event.point); if (drag) { if (selected) { selected.position = event.point; diff --git a/app/js/filters.js b/app/js/filters.js index dce2495..1e5bff7 100644 --- a/app/js/filters.js +++ b/app/js/filters.js @@ -2,11 +2,14 @@ /* Filters */ app.filter('sliding2', function() { - return function(input) { + return function(input, x) { var groups = []; for (var i = 0; i < input.length - 1; ++i) { - groups.push([input[i], input[i+1]]); + groups.push({ + x: input[i], + y: input[i+1] + }); } return groups; }; |