Commit 254b8ac9e264a35747a4bb00b6ded94bb6dfe72c
1 parent
8fefb59f
Rename Function For Annotation
Showing
2 changed files
with
6 additions
and
6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -727,8 +727,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -727,8 +727,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
727 | // annotation toolbar canvas | 727 | // annotation toolbar canvas |
728 | if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) { | 728 | if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) { |
729 | 729 | ||
730 | - $("#canvasDiv").append('<canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="doClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>'); | ||
731 | - $scope.doClick(); | 730 | + $("#canvasDiv").append('<canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="CanvasDrawing($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>'); |
731 | + $scope.CanvasDrawing(); | ||
732 | $rootScope.FreeStylePaint(); | 732 | $rootScope.FreeStylePaint(); |
733 | 733 | ||
734 | } | 734 | } |
@@ -5967,7 +5967,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5967,7 +5967,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5967 | $("#canvas").css("display", "block"); | 5967 | $("#canvas").css("display", "block"); |
5968 | $("#canvasPaint").css("display", "block"); | 5968 | $("#canvasPaint").css("display", "block"); |
5969 | 5969 | ||
5970 | - $scope.doClick(); | 5970 | + $scope.CanvasDrawing(); |
5971 | $rootScope.FreeStylePaint(); | 5971 | $rootScope.FreeStylePaint(); |
5972 | }); | 5972 | }); |
5973 | $scope.mousePs; | 5973 | $scope.mousePs; |
@@ -5983,7 +5983,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5983,7 +5983,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5983 | $scope.offsetY1 = 0; | 5983 | $scope.offsetY1 = 0; |
5984 | $scope.x = 0; | 5984 | $scope.x = 0; |
5985 | $scope.y = 0; | 5985 | $scope.y = 0; |
5986 | - $scope.doClick = function (event) { | 5986 | + $scope.CanvasDrawing = function (event) { |
5987 | 5987 | ||
5988 | $scope.clicked = true; | 5988 | $scope.clicked = true; |
5989 | // OnPaintCanvasMouseDown(event); | 5989 | // OnPaintCanvasMouseDown(event); |
@@ -6921,7 +6921,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6921,7 +6921,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6921 | 6921 | ||
6922 | $(document).keydown(function (event) { | 6922 | $(document).keydown(function (event) { |
6923 | 6923 | ||
6924 | - | 6924 | + // predefined function for detecting keyboard key |
6925 | if (event.which == 46) { | 6925 | if (event.which == 46) { |
6926 | 6926 | ||
6927 | if ($rootScope.shapeTypePin == "Pin") { | 6927 | if ($rootScope.shapeTypePin == "Pin") { |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -280,7 +280,7 @@ | @@ -280,7 +280,7 @@ | ||
280 | <div class="row"> | 280 | <div class="row"> |
281 | <div id="canvasDiv" class="col-sm-12 img-thumbnail" align="center"> | 281 | <div id="canvasDiv" class="col-sm-12 img-thumbnail" align="center"> |
282 | <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas> | 282 | <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas> |
283 | - <canvas id="canvas" ng-click="doClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas> | 283 | + <canvas id="canvas" ng-click="CanvasDrawing($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas> |
284 | </div> | 284 | </div> |
285 | <!--<div id="canvasDiv" style=" width: 95% !important;top:0px;overflow:scroll;background-color:white;">--> | 285 | <!--<div id="canvasDiv" style=" width: 95% !important;top:0px;overflow:scroll;background-color:white;">--> |
286 | <!--<div id="daLoaderLabel">Loading....</div>--> | 286 | <!--<div id="daLoaderLabel">Loading....</div>--> |