Against Merge Request #459

Amrita Vishnoi
2 parents 22a7eb90 dfb983ae
Showing 1 changed file with 87 additions and 71 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -3510,6 +3510,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.createSpeechBubbleBasedOnTransparencyWithCtrl = function (pointClicked_annotation, Exists_annotation, x, y, sub_id_annotation) {
+
         var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:59000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:59000;' id='bord_annotation" + $scope.j + "'></div></div>";
         if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
             if (Exists_annotation == 0) {
@@ -3935,7 +3936,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     function mouseUpListener(e) {
-
+       
         $scope.isTBDrawnOnBodyRegion = false;
         $(".com").remove();
@@ -5284,7 +5285,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     function TransparencyCanvasClickListener(evt) {
-        //alert('tb clicked')
+       // alert('tb clicked');
         // debugger;
         var pixelData;
         var pixelDataTrans;
@@ -5460,7 +5461,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 }
                 //$scope.annotationTextArrayT1.push(annotations.annotationT1);
                 // $scope.annotationTextArrayT2.push(annotations.annotationT2);
-
+               
                 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
             }
             else
@@ -5477,7 +5478,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 }
                 //$scope.annotationTextArrayT1.push(annotations.annotationT1);
                 // $scope.annotationTextArrayT2.push(annotations.annotationT2);
-
+               
                 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
             }
@@ -5487,7 +5488,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     function OnClickModestyTransCanvas(evt) {
-
+        var tCanvasLeft = $(".ui-wrapper").css("left");
+        var tCanvasLeftAftrSplit = tCanvasLeft.split("p");
+        var tCanvasTop = $(".ui-wrapper").css("top");
+        var tCanvasTopAftrSplit = tCanvasTop.split("p");
+        var tCanvasWidth = $(".ui-wrapper").css("width");
+        var tCanvasWidthAftrSplit = tCanvasWidth.split("p");
+        var tCanvasHeight = $(".ui-wrapper").css("height");
+        var tCanvasHeightAftrSplit = tCanvasHeight.split("p");
+      //  alert("modesty");
+        var tCanvasTotalWidth = parseInt(tCanvasLeftAftrSplit[0]) + parseInt(tCanvasWidthAftrSplit[0]);
+        var tCanvasTotalHeight = parseInt(tCanvasTopAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]);
         var mousePos = $scope.getMousePos(evt);
         var canvasDiv = document.getElementById('canvasDiv');
         var verticalScrollPosition = canvasDiv.scrollTop;
@@ -5499,94 +5510,95 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var canavsX = evt.currentTarget.offsetLeft;
         var canvasY = evt.currentTarget.offsetTop;
-        var canvasId = evt.currentTarget.id;
-        var canavsContext = document.getElementById(canvasId).getContext('2d');
-        var RGBColor = $scope.GetRGBColor(canavsContext, actulalX, actualY, canavsX, canvasY);
-
-        var annotationText;
+        if ((tCanvasLeftAftrSplit[0] <= actulalX && (actulalX <= tCanvasTotalWidth)) && (tCanvasTopAftrSplit[0] <= actualY && actualY <= tCanvasTotalHeight)) {
+            var canvasId = evt.currentTarget.id;
+            var canavsContext = document.getElementById(canvasId).getContext('2d');
+            var RGBColor = $scope.GetRGBColor(canavsContext, actulalX, actualY, canavsX, canvasY);
-        //Modesty ON
-        if (canvasId.match('modestyImg') && RGBColor != '000000') {
-            RGBColor = DA[0].figLeafTermId;
-            annotationText = $scope.GetAnnotationBasedOnActualTermNo(RGBColor);
-            $scope.annotationTextArrayT1 = [];
-            $scope.annotationTextArrayT2 = [];
-            $scope.annotationTextArrayT1.push(annotationText);
-            $scope.annotationTextArrayT2.push(annotationText);
-        }
-            //Modesty On but clicked somewhre else, we did modesty check because the modesty image covers whole body region so if user will click to 
-            //see the annotation apart from leaf then the actual click will be on modesty canvas, but for annotation er
-            // 
-        else if (canvasId.match('modestyImg') && RGBColor == '000000') {
+            var annotationText;
-            var bodyRegionId = canvasId.slice(-1);
+            //Modesty ON
+            if (canvasId.match('modestyImg') && RGBColor != '000000') {
+                RGBColor = DA[0].figLeafTermId;
+                annotationText = $scope.GetAnnotationBasedOnActualTermNo(RGBColor);
+                $scope.annotationTextArrayT1 = [];
+                $scope.annotationTextArrayT2 = [];
+                $scope.annotationTextArrayT1.push(annotationText);
+                $scope.annotationTextArrayT2.push(annotationText);
+            }
+                //Modesty On but clicked somewhre else, we did modesty check because the modesty image covers whole body region so if user will click to 
+                //see the annotation apart from leaf then the actual click will be on modesty canvas, but for annotation er
+                // 
+            else if (canvasId.match('modestyImg') && RGBColor == '000000') {
-            var maskCanvasId = 'imageCanvas' + bodyRegionId + '_mci';
-            var maskCanvas = document.getElementById(maskCanvasId);
-            var maskCanvasContext = maskCanvas.getContext("2d");
-            //RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, xcanavsX, canvasY);
-            //annotationText = $scope.GetAnnotationText(parseInt(RGBColor));
+                var bodyRegionId = canvasId.slice(-1);
-            //transparecncy canvas
-            var maskCanvasTransId = 'transparencyTempCanvasMask_' + bodyRegionId + '_mci';
-            var maskCanvastrans = document.getElementById(maskCanvasTransId);
-            var maskCanvasContexttrans = maskCanvastrans.getContext("2d");
+                var maskCanvasId = 'imageCanvas' + bodyRegionId + '_mci';
+                var maskCanvas = document.getElementById(maskCanvasId);
+                var maskCanvasContext = maskCanvas.getContext("2d");
+                //RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, xcanavsX, canvasY);
+                //annotationText = $scope.GetAnnotationText(parseInt(RGBColor));
-            var pixelData = maskCanvasContext.getImageData(Math.round(actulalX - canavsX), Math.round(actualY - canvasY), 1, 1);
+                //transparecncy canvas
+                var maskCanvasTransId = 'transparencyTempCanvasMask_' + bodyRegionId + '_mci';
+                var maskCanvastrans = document.getElementById(maskCanvasTransId);
+                var maskCanvasContexttrans = maskCanvastrans.getContext("2d");
-            var pixelDataTrans = maskCanvasContexttrans.getImageData(Math.round(actulalX - canavsX), Math.round(actualY - canvasY), 1, 1);
+                var pixelData = maskCanvasContext.getImageData(Math.round(actulalX - canavsX), Math.round(actualY - canvasY), 1, 1);
-            var annotations = $scope.getAnnotationForTransparencyBox(pixelData, pixelDataTrans, $scope);
+                var pixelDataTrans = maskCanvasContexttrans.getImageData(Math.round(actulalX - canavsX), Math.round(actualY - canvasY), 1, 1);
+                var annotations = $scope.getAnnotationForTransparencyBox(pixelData, pixelDataTrans, $scope);
-            //    var maskCanvasId = 'imageCanvas' + bodyRegionId + '_mci';
-            //    var maskCanvas = document.getElementById(maskCanvasId);
-            //    var maskCanvasContext = maskCanvas.getContext("2d");
-            //    RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, xcanavsX, canvasY);
-            //    annotationText = $scope.GetAnnotationText(parseInt(RGBColor));
+                //    var maskCanvasId = 'imageCanvas' + bodyRegionId + '_mci';
+                //    var maskCanvas = document.getElementById(maskCanvasId);
+                //    var maskCanvasContext = maskCanvas.getContext("2d");
+                //    RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, xcanavsX, canvasY);
+                //    annotationText = $scope.GetAnnotationText(parseInt(RGBColor));
-            //  createSpeechBubbleOnTransparencyBox(evt, annotations.annotationT1, annotations.annotationT2, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left + 5, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top - 50)
-            $scope.annotationTextArrayT1 = [];
-            $scope.annotationTextArrayT2 = [];
-            for (var i = 0; i <= annotations.annotationT1.length - 1; i++) {
-                $scope.annotationTextArrayT1.push(annotations.annotationT1[i]);
-            }
-            for (var i = 0; i <= annotations.annotationT2.length - 1; i++) {
-                $scope.annotationTextArrayT2.push(annotations.annotationT1[i]);
-            }
-            //$scope.annotationTextArrayT1.push(annotations.annotationT1);
-            // $scope.annotationTextArrayT2.push(annotations.annotationT2);
+                //  createSpeechBubbleOnTransparencyBox(evt, annotations.annotationT1, annotations.annotationT2, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left + 5, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top - 50)
-        }
+                $scope.annotationTextArrayT1 = [];
+                $scope.annotationTextArrayT2 = [];
+                for (var i = 0; i <= annotations.annotationT1.length - 1; i++) {
+                    $scope.annotationTextArrayT1.push(annotations.annotationT1[i]); 
-        if ($('#speechBubble').length > 0)
-            $('#speechBubble').remove();
+                }
+                for (var i = 0; i <= annotations.annotationT2.length - 1; i++) {
+                    $scope.annotationTextArrayT2.push(annotations.annotationT2[i]); 
+                }
+                //$scope.annotationTextArrayT1.push(annotations.annotationT1);
+                // $scope.annotationTextArrayT2.push(annotations.annotationT2);
+            }
-        if ($('#speechBubbleTrns').length > 0) {
-            $('#speechBubbleTrns').remove();
-        }
+            if ($('#speechBubble').length > 0)
+                $('#speechBubble').remove();
-        var tCanvasTopPos = $(".ui-wrapper").css("top");
-        var tCanvasTopPosAftrSplit = tCanvasTopPos.split("p");
-        var tCanvasHeight = $(".ui-wrapper").css("height");
-        var tCanvasHeightAftrSplit = tCanvasHeight.split("p");
-        var tCanvasAttr = parseInt(tCanvasTopPosAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]);
-        if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) <= tCanvasAttr) {
+            if ($('#speechBubbleTrns').length > 0) {
+                $('#speechBubbleTrns').remove();
+            }
-            $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
+            var tCanvasTopPos = $(".ui-wrapper").css("top");
+            var tCanvasTopPosAftrSplit = tCanvasTopPos.split("p");
+            var tCanvasHeight = $(".ui-wrapper").css("height");
+            var tCanvasHeightAftrSplit = tCanvasHeight.split("p");
+            var tCanvasAttr = parseInt(tCanvasTopPosAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]);
+         //   if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) <= tCanvasAttr) {
+                $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
+            //}
+            //else {
+            //    $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt);
+            //}
         }
-        else {
-
+        else
+        {
             $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt);
-
         }
-
-
     }
     function getAnnotationAndCraeteSpeechBubble(mirrorCanvasX, mirrorCanvasWidth, mousePos, maskCanvasContexttrans, clickedBodyRegion, x, y, evt) {
@@ -6052,6 +6064,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.enableZoom = function () {
+        $("#OnIdentify").removeClass("annotationtoolbartab");
+        $("#DrawMode").removeClass("annotationtoolbartab");
+        $('.btnCursor').removeClass('activebtncolor');
         $(".annotationTollbar").css("display", "none");
         $("#annotationButton").removeClass("active");
         $("#btnExtract").removeClass("disabled");
@@ -6060,13 +6075,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $rootScope.isNormalMode = false;
         $rootScope.isGenderChnage = false;
         $rootScope.isViewChange = false;
+       
         //if listanager is visisble then close it
         $rootScope.CloseListManager();
         $rootScope.isHighlightBodyByBodySystem = false;
-
+            
         $('#sppeachBubble').css('display', 'none');
         $("#dot").css("display", "none");