ADAM / AIAHTML5

Commit 4b280fff78f1fea104d6c38771eef456c1a1421e

Authored by Nikita Kulshreshtha
1 parent afab0321

annotation tool bar canavses was added before deletion of the canvasDiv child. changed the location.

Inline Side-by-side
Showing 1 changed file with 11 additions and 9 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @4b280ff
@@ -854,15 +854,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -854,15 +854,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
854 $scope.modestyImageInfo = []; 854 $scope.modestyImageInfo = [];
855 // annotation toolbar canvas 855 // annotation toolbar canvas
856 856
857 - //history code  
858 -  
859 - if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {  
860 - var ATBarHtml = $("#canvasDiv").append('<canvas id="canvasPaint" width="2277" height="3248" ng-click="FreeStylePaint($event)" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');  
861 - $compile(ATBarHtml)($scope);  
862 - $scope.onDrawingCanvasClick();  
863 - // $rootScope.FreeStylePaint();  
864 -  
865 - } 857 +
866 858
867 859
868 $scope.terminateCurrentlyRunningWPs(); 860 $scope.terminateCurrentlyRunningWPs();
@@ -927,6 +919,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -927,6 +919,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
927 $scope.ColoredImageSRC = []; 919 $scope.ColoredImageSRC = [];
928 } 920 }
929 921
  922 + //history code
  923 +
  924 + if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
  925 + var ATBarHtml = $("#canvasDiv").append('<canvas id="canvasPaint" width="2277" height="3248" ng-click="FreeStylePaint($event)" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');
  926 + $compile(ATBarHtml)($scope);
  927 + $scope.onDrawingCanvasClick();
  928 + // $rootScope.FreeStylePaint();
  929 +
  930 + }
  931 +
930 if ($scope.bodyRegionCoordinates != null || $scope.bodyRegionCoordinates != undefined) { 932 if ($scope.bodyRegionCoordinates != null || $scope.bodyRegionCoordinates != undefined) {
931 angular.forEach($scope.bodyRegionCoordinates, function (value, key) { 933 angular.forEach($scope.bodyRegionCoordinates, function (value, key) {
932 934