manually merged branch Bug#23948

Amrita Vishnoi
1 parent b41e41fa
Showing 1 changed file with 77 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -5429,28 +5429,47 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             var imageData = imageD.data;
             var length = imageData.length;
-            // set every fourth value to the desired number of transparency
+            //to resolve lateral arm black issue in highlight mode
+            if ($scope.isHighLight) {
+                // if ($scope.voId == "9" || $scope.voId == "11") {
+
+                var c = 0;
+                for (var i = 0; i < imageData.length; i += 4) {
+                    if (imageData[i] == imageData[i + 1] && imageData[i + 1] == imageData[i + 2] && imageData[i + 2] === 0) {
+                        imageData[i + 3] = 0;
+                    }
+
+                }
+                tempCtx.putImageData(imageD, 0, 0);
+                //}
+            }
+            // set every fourth value to the desired number of transparency
+            var imageD1 = tempCtx.getImageData(0, 0, Width, Height);
+            var imageData1 = imageD1.data;
+            var length = imageData.length;
             for (var i = 3; i < length; i += 4) {
                 if ($scope.voId == "9" || $scope.voId == "11") {
-                    if (imageData[i] == 0) {
+                    if (imageData1[i] == 0) {
                     }
                     else {
-                        imageData[i] = ((255) * (parseInt(transNumber))) / 100;
+                        imageData1[i] = ((255) * (parseInt(transNumber))) / 100;
                     }
                 }
                 else {
-                    imageData[i] = ((255) * (parseInt(transNumber))) / 100;
+                    imageData1[i] = ((255) * (parseInt(transNumber))) / 100;
                 }
             }
-            tempCtx.putImageData(imageD, 0, 0);
+
+
+            tempCtx.putImageData(imageD1, 0, 0);
             $scope.widthOfImage = WidthforTransImage;
@@ -5520,7 +5539,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $scope.EnableUI();
         }
-
         $scope.changeTransparency = function () {
             //this changes the transparency when user click on transparency scale(we have already set the original 
             //data on tras canvas irrespective of the trans number, so we can chnage the transparnecy of original data not the manipulated)
@@ -5534,31 +5552,52 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             var modestyTemCanvas = $("canvas[id*='tempCanvasModesty_']");
             if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
+                //for modesty 
                 for (var j = 0; j < modestyTransCanvases.length; j++) {
-                    var ctx = document.getElementById(modestyTransCanvases[j].id).getContext('2d');
-                    var imageDa = ctx.getImageData(0, 0, modestyTransCanvases[j].width, modestyTransCanvases[j].height);
+                    var modctx = document.getElementById(modestyTransCanvases[j].id).getContext('2d');
+                    var modimageDa = modctx.getImageData(0, 0, modestyTransCanvases[j].width, modestyTransCanvases[j].height);
                     //modestyTransCanvases[j].parentNode.removeChild(modestyTransCanvases[j]);
-                    var imageData = imageDa.data;
-                    var length = imageData.length;
-                    // set every fourth value to 50
+                    var modimageData = modimageDa.data;
+                    var length = modimageData.length;
+
+                    if ($scope.isHighLight) {
+                        //if ($scope.voId == "9" || $scope.voId == "11") {
+
+                        var c = 0;
+                        for (var i = 0; i < modimageData.length; i += 4) {
+                            if (modimageData[i] == modimageData[i + 1] && modimageData[i + 1] == modimageData[i + 2] && modimageData[i + 2] === 0) {
+                                modimageData[i + 3] = 0;
+                            }
+
+                        }
+                        modctx.putImageData(modimageDa, 0, 0);
+                        //  }
+                    }
+                    // set every fourth value to desired transparency
+                    var ctx1 = document.getElementById(modestyTransCanvases[j].id).getContext('2d');
+                    var imageDa1 = ctx1.getImageData(0, 0, modestyTransCanvases[j].width, modestyTransCanvases[j].height);
+                    //modestyTransCanvases[j].parentNode.removeChild(modestyTransCanvases[j]);
+
+                    var imageData1 = imageDa1.data;
+                    var length = imageData1.length;
                     for (var i = 3; i < length; i += 4) {
-                        //NIKITA
+
                         if ($scope.voId == "9" || $scope.voId == "11") {
-                            if (imageData[i] == 0) {
+                            if (imageData1[i] == 0) {
                             }
                             else {
-                                imageData[i] = ((255) * (parseInt(transNumber))) / 100;
+                                imageData1[i] = ((255) * (parseInt(transNumber))) / 100;
                             }
                         }
                         else {
-                            if (imageData[i] == 0) {
+                            if (imageData1[i] == 0) {
                             }
                             else
-                                imageData[i] = ((255) * (parseInt(transNumber))) / 100;
+                                imageData1[i] = ((255) * (parseInt(transNumber))) / 100;
                         }
                         // imageData[i] = ((255) * (parseInt(transNumber))) / 100;
@@ -5567,7 +5606,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                     // imageDa.data = imageData;
                     // and put the imagedata back to the canvas
                     //ctx.putImageData(imageDa, XforTransImage, YforTransImage);
-                    ctx.putImageData(imageDa, 0, 0);
+                    ctx1.putImageData(imageDa1, 0, 0);
                 }
             }
@@ -5575,12 +5614,32 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             var ctx = document.getElementById('transparencyCanvas').getContext('2d');
             // var imageDa = ctx.getImageData(XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage);
+            var imageDa1 = ctx.getImageData(0, 0, $scope.transparencyCanvasWidth, $scope.transparencyCanvasHeight);
+
+            // get the image data values 
+            var imageData1 = imageDa1.data;
+            var length = imageData1.length;
+
+            if ($scope.isHighLight) {
+                if ($scope.voId == "9" || $scope.voId == "11") {
+
+                    var c = 0;
+                    for (var i = 0; i < imageData1.length; i += 4) {
+                        if (imageData1[i] == imageData1[i + 1] && imageData1[i + 1] == imageData1[i + 2] && imageData1[i + 2] === 0) {
+                            imageData1[i + 3] = 0;
+                        }
+
+                    }
+                    ctx.putImageData(imageDa1, 0, 0);
+                }
+            }
+
+            // set every fourth value to selected transparency
             var imageDa = ctx.getImageData(0, 0, $scope.transparencyCanvasWidth, $scope.transparencyCanvasHeight);
             // get the image data values 
             var imageData = imageDa.data;
             var length = imageData.length;
-            // set every fourth value to 50
             for (var i = 3; i < length; i += 4) {
                 //NIKITA
                 if ($scope.voId == "9" || $scope.voId == "11") {
@@ -5611,7 +5670,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             //}
         }
-   
         // History Maintained Issue//
         $rootScope.getAnnotationTextBasedOnSelectedBodyRegion = function (event) {