Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Nikita Kulshreshtha
2 parents b11818b4 eac09189
Showing 2 changed files with 46 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -3907,6 +3907,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //  console.log("extract button is active");
         }
+
+      
         //in case of annotation toolbar is open below code will be executed to draw Tbox
         if ($rootScope.isAnnotationWindowOpen == true) {
             if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
@@ -5649,15 +5651,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //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();
+        
+        $rootScope.switchCanvas();
+        if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
+
+            $("#OnIdentify").removeClass('annotationtoolbartab');
+            $("#DrawMode").addClass('annotationtoolbartab');
+            //$('.btnCursor').trigger('click');
+            $("#annotationpaintbrushsize").removeClass("activebtncolor");
+            $('.btnCursor').addClass('activebtncolor');
+
         }
-        else
-        {
-            $rootScope.switchCanvas();
+        else {
+
+            $("#OnIdentify").addClass('annotationtoolbartab');
+            $("#DrawMode").removeClass('annotationtoolbartab');
         }
+     
       //  $rootScope.switchCanvas();
         //To enable extract button
         $scope.isTransparencyActivated = false;
@@ -670,8 +670,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-line").addClass("activebtncolor");
-
-
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
@@ -687,6 +688,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-pin").addClass("activebtncolor");
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
     $rootScope.Cursor = function () {
@@ -696,6 +700,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $(".btn-annotation").removeClass("activebtncolor");
         //   $("#" + e.currentTarget.id).removeClass("activebtncolor");
         $('.btnCursor').addClass('activebtncolor');
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
@@ -708,10 +715,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-rectangle").addClass("activebtncolor");
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
     $rootScope.paintBrush = function () {
-        $rootScope.isAnnotaionToolBarDrawingModeActive = false;
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
         if ($rootScope.disableAnnotationtoolOnListManager == true) {
             $rootScope.switchCanvas();
             var canvasPaintZindex = $('#canvasPaint').css("z-index");  //x
@@ -764,7 +774,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-brush").addClass("activebtncolor");
-
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
     }
     $rootScope.switchCanvasToPaintCanvas = function (e) {
@@ -789,6 +800,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-circle").addClass("activebtncolor");
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
     $rootScope.DrawArrow = function (e) {
@@ -800,6 +814,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-arrow").addClass("activebtncolor");
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
     $rootScope.DrawText = function () {
@@ -812,6 +829,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-Text").addClass("activebtncolor");
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
     $rootScope.DrawPolygon = function () {
@@ -819,6 +839,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#canvasPaint").css("display", "block");
         $("#canvas").css("display", "block");
         $rootScope.shapeType = "DrawPolygon";
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
+        $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
@@ -841,6 +864,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-erase").addClass("activebtncolor");
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
     }