From 202032410ad2c2ddbd4764fd932a8ade7d76685b Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Thu, 31 Aug 2017 11:15:06 +0530 Subject: [PATCH] Manually merge in QA against #638 request --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 099d570..3d8b224 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1583,18 +1583,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l // for mirrored canvas - if (bodyRegionId == 4 || bodyRegionId == 5 || bodyRegionId == 6) { - var grayCanvasID = 'imageCanvas' + bodyRegionId + '_MR'; - var grayCanvasMR = document.getElementById(grayCanvasID); + if ($rootScope.voId == "1" || $rootScope.voId == "4" || $rootScope.voId == "5" || $rootScope.voId == "8") { + if (bodyRegionId == 4 || bodyRegionId == 5 || bodyRegionId == 6) { + var grayCanvasID = 'imageCanvas' + bodyRegionId + '_MR'; + var grayCanvasMR = document.getElementById(grayCanvasID); - var grayCanvasContextMR = grayCanvasMR.getContext("2d"); - if ($rootScope.grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) { - var grayImageDataMR = $rootScope.grayImageMRDataList[bodyRegionId]; + var grayCanvasContextMR = grayCanvasMR.getContext("2d"); + if ($rootScope.grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) { + var grayImageDataMR = $rootScope.grayImageMRDataList[bodyRegionId]; - grayCanvasContextMR.putImageData(grayImageDataMR, 0, 0); + grayCanvasContextMR.putImageData(grayImageDataMR, 0, 0); + } } } - } } } @@ -1980,18 +1981,20 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } // for unhighlight the mirrored body region - if (bodyRegionId == 4 || bodyRegionId == 5 || bodyRegionId == 6) { - var grayCanvasID = 'imageCanvas' + bodyRegionId + '_MR'; - var grayCanvasMR = document.getElementById(grayCanvasID); + if ($rootScope.voId == "1" || $rootScope.voId == "4" || $rootScope.voId == "5" || $rootScope.voId == "8") { + if (bodyRegionId == 4 || bodyRegionId == 5 || bodyRegionId == 6) { + var grayCanvasID = 'imageCanvas' + bodyRegionId + '_MR'; + var grayCanvasMR = document.getElementById(grayCanvasID); - var grayCanvasContextMR = grayCanvasMR.getContext("2d"); + var grayCanvasContextMR = grayCanvasMR.getContext("2d"); - if ($rootScope.grayImageMRDataList[bodyRegionId] != null || $rootScope.grayImageMRDataList[bodyRegionId] != undefined) { + if ($rootScope.grayImageMRDataList[bodyRegionId] != null || $rootScope.grayImageMRDataList[bodyRegionId] != undefined) { - var grayImageDataMR = $rootScope.grayImageMRDataList[bodyRegionId]; + var grayImageDataMR = $rootScope.grayImageMRDataList[bodyRegionId]; - grayCanvasContextMR.putImageData(grayImageDataMR, 0, 0); + grayCanvasContextMR.putImageData(grayImageDataMR, 0, 0); + } } } -- libgit2 0.21.4