merged manually against Merge Request #754

Amrita Vishnoi
2 parents 3e8dfdef 1c327929
Showing 2 changed files with 64 additions and 33 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1465,7 +1465,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 $scope.isLayerChange = false;
             }
-            if (evt.ctrlKey) {
+            if (evt.ctrlKey || evt.metaKey) {
                 $rootScope.multiAnnotationIsON = true;
                 //document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
@@ -1881,7 +1881,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 $scope.isLayerChange = false;
             }
-            if (evt.ctrlKey) {
+            if (evt.ctrlKey || evt.metaKey) {
                 $rootScope.multiAnnotationIsON = true;
                 //$("#btnZoom").addClass('disabled');
@@ -3616,7 +3616,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             // we decide the size of speech bubble
             //2.
-            if (event.ctrlKey) {
+            if (event.ctrlKey || event.metaKey) {
                 console.log('ctrl pressed');
                 $scope.multiAnnotationIsON = true;
                 //2.1 create unique speech bubbles
@@ -3685,7 +3685,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         else {
             $scope.longest_annotationT1 = $scope.annotationTextArrayT1.reduce(function (a, b) { return a.length > b.length ? a : b; });
             $scope.longest_annotationT2 = $scope.annotationTextArrayT2.reduce(function (a, b) { return a.length > b.length ? a : b; });
-            if (event.ctrlKey) {
+            if (event.ctrlKey || event.metaKey) {
                 $scope.j = $scope.j + 1;
                 var sub_id_annotation = "black_annotation" + $scope.j;
                 var pointClicked_annotation = parseInt(x) + parseInt(y);
@@ -4545,8 +4545,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 })
                 //for modesty
-                if ($rootScope.isModestyOn == true && $scope.modestyImageInfo.length > 0) {
-                    $.each($scope.modestyImageInfo, function (index, value) {
+                //if ($rootScope.isModestyOn == true && $scope.modestyImageInfo.length > 0) {
+                if ($scope.modestyImageInfo.length > 0) {
+
+                $.each($scope.modestyImageInfo, function (index, value) {
                         var tBoxDimesions = $scope.getTBoxDimesions($scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, value.x, value.y, value.Height, value.Width);
@@ -4680,7 +4682,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
     $scope.loadTransparencyImage = function (bodyRegionId, Height, Width, X, Y, IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, scope, isLayerChanged, isTransparencyChanged, isResized) {
-
         var transparencyCanvas = document.getElementById('transparencyCanvas');
         TransparencyBoxStartX = parseInt((transparencyCanvas.style.left).replace('px', ''));
@@ -4700,6 +4701,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         var HeightforTransImage = TBImageDimensions.HeightforTransImageTB;
         var YforTransImage = TBImageDimensions.YforTransImageTB;
+
         //0. get current layer number
         if (isResized) {
             //do nothing
@@ -4735,7 +4737,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         var tranparencyImgSrc;
         var tranparencyMaskImgSrc;
-        if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+        if ((bodyRegionId.match('modestyImg'))) {
             var modestyBodyRegionData = new jinqJs()
                                           .from($scope.modestyImageInfo)
                                          .where('bodyRegionId == ' + bodyRegionId)
@@ -4785,8 +4787,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             transparencyTempcanavsMask.id = 'transparencyTempCanvasMask_MR' + bodyRegionId + '_mci';
         }
         else {
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
-                transparencyTempCanvas.id = 'transparencyTempCanvas_' + bodyRegionId;
+            if ((bodyRegionId.match('modestyImg'))) {
+
+            transparencyTempCanvas.id = 'transparencyTempCanvas_' + bodyRegionId;
             }
             else {
@@ -4806,7 +4809,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         document.getElementById('canvasDiv').appendChild(transparencyTempCanvas);
         //create temp mask canvas
-        if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { }
+        if ((bodyRegionId.match('modestyImg'))) { }
+
         else {
             transparencyTempcanavsMask.height = Height;
             transparencyTempcanavsMask.width = Width;
@@ -4819,10 +4823,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         }
         //for modesty canvas
-        if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+        if ((bodyRegionId.match('modestyImg'))) {
             var modestyTransTempCanvasId = 'tempCanvasModesty_' + bodyRegionId;
             var modestyTransCanvasId = 'modestyTransCanavs_' + bodyRegionId;
+           
             if (document.getElementById(modestyTransTempCanvasId) != null) {
                 document.getElementById(modestyTransTempCanvasId).parentNode.removeChild(document.getElementById(modestyTransTempCanvasId));
             }
@@ -4837,7 +4842,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 tempCanvasModesty.style.top = 10 + 'px';
                 tempCanvasModesty.style.backgroundColor = "transparent";
                 tempCanvasModesty.style.visibility = 'hidden';
-                tempCanvasModesty.style.border = "black 1px solid";
+               // tempCanvasModesty.style.border = "black 1px solid";
                 document.getElementById('canvasDiv').appendChild(tempCanvasModesty);
             }
             if (document.getElementById(modestyTransCanvasId) != null) {
@@ -4845,16 +4850,21 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             }
             if (document.getElementById(modestyTransCanvasId) == null || document.getElementById(modestyTransCanvasId) == undefined) {
-                $rootScope.isTBoxModestyVisible = true;
+               
                 var canvasModesty = document.createElement('canvas');
                 canvasModesty.id = modestyTransCanvasId;
+                canvasModesty.className = 'transModestyImg'
                 canvasModesty.height = Height;
                 canvasModesty.width = Width;
                 canvasModesty.style.position = "absolute";
                 canvasModesty.style.left = X + 'px';
                 canvasModesty.style.top = Y + 'px';
-                canvasModesty.style.visibility = 'visible';
-                if ($rootScope.voId == "11") {
+                if ($rootScope.isModestyOn == true) {
+                    canvasModesty.style.visibility = 'visible';
+                    $rootScope.isTBoxModestyVisible = true;
+                }
+                else
+                    canvasModesty.style.visibility = 'hidden';
                     canvasModesty.style.zIndex = 11000;
                 }
@@ -4875,8 +4885,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 tempCanvasID = 'transparencyTempCanvas_MR_' + bodyRegionId;
             }
             else {
-                if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
-                    tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId;//bodyRegionId;
+                if ((bodyRegionId.match('modestyImg'))) {
+
+                tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId;//bodyRegionId;
                 }
                 else
                     tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId;
@@ -4916,7 +4927,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 if ($rootScope.isHighLight != true) {
-                    if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+                        if ((bodyRegionId.match('modestyImg'))) {
+
                         var modestyTempCanvasId = 'tempCanvasModesty_' + bodyRegionId;
                         if (document.getElementById(modestyTempCanvasId) != undefined || document.getElementById(modestyTempCanvasId) != null) {
                             var contxModestyTemp = document.getElementById(modestyTempCanvasId).getContext('2d');
@@ -4971,7 +4983,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         }
         //set modesty image visiblility true/false as per layer
-        // if(bodyRegionId.match('modestyImg3'))
         var BRID = '';
         if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId) != null) {
             BRID = bodyRegionId[bodyRegionId.length - 1];
@@ -4997,7 +5008,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                             var modestyCanavs = document.getElementById(modestyTransCanvases[j].id);
-                            if ((parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) {
+                            if ($rootScope.isModestyOn == true && (parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) {
                                 modestyCanavs.style.visibility = 'visible';
                             }
@@ -5034,7 +5045,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             XforCopyImage = 0;
             WidthforCopyImage = Width;
             WidthforTransImage = Width;
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+
+            if ((bodyRegionId.match('modestyImg'))) {
                 XforTransImage = 0;
             }
             else
@@ -5048,7 +5060,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             WidthforTransImage = parseInt(TransparencyEndX) - parseInt(X);
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+            if ((bodyRegionId.match('modestyImg'))) {
                 XforTransImage = 0;
             }
             else
@@ -5061,7 +5073,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             WidthforCopyImage = parseInt(X) + parseInt(Width) - parseInt(TransparencyBoxStartX);
             WidthforTransImage = parseInt(X) + parseInt(Width) - parseInt(TransparencyBoxStartX);
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+            if ((bodyRegionId.match('modestyImg'))) {
                 XforTransImage = parseInt(TransparencyBoxStartX) - parseInt(X);
             }
@@ -5072,7 +5084,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             XforCopyImage = parseInt(TransparencyBoxStartX) - parseInt(X);//parseInt(X) + parseInt(Width) - parseInt(scope.TransparencyBoxStartX)// scope.TransparencyBoxStartX ;
             WidthforCopyImage = parseInt(TransparencyEndX) - parseInt(TransparencyBoxStartX);
             WidthforTransImage = parseInt(TransparencyEndX) - parseInt(TransparencyBoxStartX);
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+                if ((bodyRegionId.match('modestyImg'))) {
                 XforTransImage = parseInt(TransparencyBoxStartX) - parseInt(X);
             }
@@ -5089,7 +5101,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             HeightforCopyImage = Height;
             HeightforTransImage = Height;
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+
+            if ((bodyRegionId.match('modestyImg'))) {
                 YforTransImage = 0;
             }
             else
@@ -5102,7 +5115,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             HeightforTransImage = (parseInt(TransparencyBoxEndY)) - parseInt(Y)// - parseInt(scope.TransparencyBoxStartY));
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+            if ((bodyRegionId.match('modestyImg'))) {
                 YforTransImage = 0;
             }
             else
@@ -5114,8 +5127,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             YforCopyImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
             HeightforCopyImage = parseInt(Y) + parseInt(Height) - parseInt(TransparencyBoxStartY);
             HeightforTransImage = parseInt(Y) + parseInt(Height) - parseInt(TransparencyBoxStartY);
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
-                YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
+
+            if ((bodyRegionId.match('modestyImg'))) {
+                    YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
             }
             else
@@ -5127,7 +5141,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             YforCopyImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
             HeightforCopyImage = parseInt(TransparencyBoxEndY) - parseInt(TransparencyBoxStartY);
             HeightforTransImage = parseInt(TransparencyBoxEndY) - parseInt(TransparencyBoxStartY);
-            if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+
+            if ((bodyRegionId.match('modestyImg'))) {
                 YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
             }
@@ -5204,6 +5219,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
     $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized) {
+
+
         var transNumber = $scope.transNumber;//txtTransparencyChange.value;
         //this changes the transparency when transparency is already activated and user resizes or chage the layer
@@ -5250,7 +5267,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         var ctx;
-        if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+        if ((bodyRegionId.match('modestyImg'))) {
+
             var modestyTransCanvasId = 'modestyTransCanavs_' + bodyRegionId
             ctx = document.getElementById(modestyTransCanvasId).getContext('2d');
         }
@@ -5261,7 +5279,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         ctx.drawImage(tmpCanvasContext, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage)
-        if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
+            if ((bodyRegionId.match('modestyImg'))) {
             var imageD1 = ctx.getImageData(0, 0, Width, Height);
             var imageData1 = imageD1.data;
@@ -5276,8 +5294,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             }
-
             ctx.putImageData(imageD1, 0, 0);
+            if ($rootScope.isModestyOn)
+                document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'visible';
+            else
+                document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'hidden';
         }
@@ -4180,6 +4180,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                     $('.modestyImg').css('visibility', 'hidden');
                 }
             }
+
+            if ($('.transModestyImg') != null) {
+                if (($rootScope.globalSetting.modesty == 'Y')) {
+                    $('.transModestyImg').css('visibility', 'visible');
+                }
+
+                else {
+                    $('.transModestyImg').css('visibility', 'hidden');
+                }
+            }
             $rootScope.changeNavigatorModesty();
         }