Commit 202032410ad2c2ddbd4764fd932a8ade7d76685b
1 parent
4b9dcd1f
Manually merge in QA against #638 request
Showing
1 changed file
with
18 additions
and
15 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -1583,18 +1583,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -1583,18 +1583,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 1583 | 1583 | ||
| 1584 | // for mirrored canvas | 1584 | // for mirrored canvas |
| 1585 | 1585 | ||
| 1586 | - if (bodyRegionId == 4 || bodyRegionId == 5 || bodyRegionId == 6) { | ||
| 1587 | - var grayCanvasID = 'imageCanvas' + bodyRegionId + '_MR'; | ||
| 1588 | - var grayCanvasMR = document.getElementById(grayCanvasID); | 1586 | + if ($rootScope.voId == "1" || $rootScope.voId == "4" || $rootScope.voId == "5" || $rootScope.voId == "8") { |
| 1587 | + if (bodyRegionId == 4 || bodyRegionId == 5 || bodyRegionId == 6) { | ||
| 1588 | + var grayCanvasID = 'imageCanvas' + bodyRegionId + '_MR'; | ||
| 1589 | + var grayCanvasMR = document.getElementById(grayCanvasID); | ||
| 1589 | 1590 | ||
| 1590 | - var grayCanvasContextMR = grayCanvasMR.getContext("2d"); | ||
| 1591 | - if ($rootScope.grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) { | ||
| 1592 | - var grayImageDataMR = $rootScope.grayImageMRDataList[bodyRegionId]; | 1591 | + var grayCanvasContextMR = grayCanvasMR.getContext("2d"); |
| 1592 | + if ($rootScope.grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) { | ||
| 1593 | + var grayImageDataMR = $rootScope.grayImageMRDataList[bodyRegionId]; | ||
| 1593 | 1594 | ||
| 1594 | - grayCanvasContextMR.putImageData(grayImageDataMR, 0, 0); | 1595 | + grayCanvasContextMR.putImageData(grayImageDataMR, 0, 0); |
| 1596 | + } | ||
| 1595 | } | 1597 | } |
| 1596 | } | 1598 | } |
| 1597 | - | ||
| 1598 | } | 1599 | } |
| 1599 | } | 1600 | } |
| 1600 | } | 1601 | } |
| @@ -1980,18 +1981,20 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -1980,18 +1981,20 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 1980 | } | 1981 | } |
| 1981 | 1982 | ||
| 1982 | // for unhighlight the mirrored body region | 1983 | // for unhighlight the mirrored body region |
| 1983 | - if (bodyRegionId == 4 || bodyRegionId == 5 || bodyRegionId == 6) { | ||
| 1984 | - var grayCanvasID = 'imageCanvas' + bodyRegionId + '_MR'; | ||
| 1985 | - var grayCanvasMR = document.getElementById(grayCanvasID); | 1984 | + if ($rootScope.voId == "1" || $rootScope.voId == "4" || $rootScope.voId == "5" || $rootScope.voId == "8") { |
| 1985 | + if (bodyRegionId == 4 || bodyRegionId == 5 || bodyRegionId == 6) { | ||
| 1986 | + var grayCanvasID = 'imageCanvas' + bodyRegionId + '_MR'; | ||
| 1987 | + var grayCanvasMR = document.getElementById(grayCanvasID); | ||
| 1986 | 1988 | ||
| 1987 | - var grayCanvasContextMR = grayCanvasMR.getContext("2d"); | 1989 | + var grayCanvasContextMR = grayCanvasMR.getContext("2d"); |
| 1988 | 1990 | ||
| 1989 | - if ($rootScope.grayImageMRDataList[bodyRegionId] != null || $rootScope.grayImageMRDataList[bodyRegionId] != undefined) { | 1991 | + if ($rootScope.grayImageMRDataList[bodyRegionId] != null || $rootScope.grayImageMRDataList[bodyRegionId] != undefined) { |
| 1990 | 1992 | ||
| 1991 | - var grayImageDataMR = $rootScope.grayImageMRDataList[bodyRegionId]; | 1993 | + var grayImageDataMR = $rootScope.grayImageMRDataList[bodyRegionId]; |
| 1992 | 1994 | ||
| 1993 | - grayCanvasContextMR.putImageData(grayImageDataMR, 0, 0); | 1995 | + grayCanvasContextMR.putImageData(grayImageDataMR, 0, 0); |
| 1994 | 1996 | ||
| 1997 | + } | ||
| 1995 | } | 1998 | } |
| 1996 | } | 1999 | } |
| 1997 | 2000 |