Merge branch 'TBIssue1' into Develop

Nikita Kulshreshtha
2 parents afab0321 fe39ec41
Showing 2 changed files with 28 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -854,15 +854,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.modestyImageInfo = [];
         // annotation toolbar canvas
  
-        //history code
-       
-        if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
-            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>');
-            $compile(ATBarHtml)($scope);
-            $scope.onDrawingCanvasClick();
-            //  $rootScope.FreeStylePaint();
-
-        }
+    
  
  
         $scope.terminateCurrentlyRunningWPs();
@@ -927,6 +919,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $scope.ColoredImageSRC = [];
         }
  
+        //history code
+
+        if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
+            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>');
+            $compile(ATBarHtml)($scope);
+            $scope.onDrawingCanvasClick();
+            //  $rootScope.FreeStylePaint();
+
+        }
+
         if ($scope.bodyRegionCoordinates != null || $scope.bodyRegionCoordinates != undefined) {
             angular.forEach($scope.bodyRegionCoordinates, function (value, key) {
  
@@ -5644,18 +5646,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
  
     $scope.CloseTransparencyBox = function () {
-
-
+     
+        //for enabling annoataions. 
+        //Now everything si done on canavases uswed in annotation toolbar.
+      
+        if (parseInt($("#canvasPaint").css("z-index")) > parseInt($("#canvas").css("z-index")))
+        {
+            $rootScope.switchCanvasToPaintCanvas();
+        }
+        else
+        {
+            $rootScope.switchCanvas();
+        }
+      //  $rootScope.switchCanvas();
         //To enable extract button
         $scope.isTransparencyActivated = false;
         $("#btnExtract").removeClass("disabled");
  
-        //$('.com_anno').css('display', 'none');
-
-        //$('#sppeachBubble_annotation').css('display', 'none');
-        //$('#dot_annotation').css('display', 'none');
-        //$('#bord_annotation').css('display', 'none');
-
  
         $('.com_anno').remove();
  
@@ -596,6 +596,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.CIAnotationIdentifyModeOff = false;
     $rootScope.OnIdentifyClick = function () {
  
+
         $("#OnIdentify").addClass("annotationtoolbartab");
         $("#DrawMode").removeClass("annotationtoolbartab");
         //  $rootScope.isIdetifyClicked = true;
@@ -614,6 +615,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
  
         }
  
+        $("#annotationpaintbrushsize").removeClass("activebtncolor");
+        $("#annotationpainteraser").removeClass("activebtncolor");
+
         $rootScope.isAnnotaionToolBarDrawingModeActive = false;
         $rootScope.switchCanvas();
     }