Commit cee1f43ff736814108d3c25d59bf75dc2d3f6239
1 parent
dc69a664
Refs: # 4464
1. fixed issues: After unhighlight implementation, the highlight with CTRL has stopped working.
Showing
1 changed file
with
10 additions
and
11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -1069,24 +1069,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1069,24 +1069,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 1069 | //debugger; | 1069 | //debugger; |
| 1070 | var RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y); | 1070 | var RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y); |
| 1071 | 1071 | ||
| 1072 | - | ||
| 1073 | - | ||
| 1074 | if ($rootScope.isHighLight) | 1072 | if ($rootScope.isHighLight) |
| 1075 | { | 1073 | { |
| 1076 | if ($scope.machedBodyRegion.length > 0) | 1074 | if ($scope.machedBodyRegion.length > 0) |
| 1077 | { | 1075 | { |
| 1078 | - for(var i=0;i<$scope.machedBodyRegion.length;i++) | ||
| 1079 | - { | ||
| 1080 | - var bodyRegionId = $scope.machedBodyRegion[i]; | 1076 | + if ($scope.multiAnnotationIsON == false) { |
| 1077 | + for (var i = 0; i < $scope.machedBodyRegion.length; i++) { | ||
| 1078 | + var bodyRegionId = $scope.machedBodyRegion[i]; | ||
| 1081 | 1079 | ||
| 1082 | - var grayCanvasID = 'imageCanvas' + bodyRegionId; | ||
| 1083 | - var grayCanvas = document.getElementById(grayCanvasID); | 1080 | + var grayCanvasID = 'imageCanvas' + bodyRegionId; |
| 1081 | + var grayCanvas = document.getElementById(grayCanvasID); | ||
| 1084 | 1082 | ||
| 1085 | - var grayCanvasContext = grayCanvas.getContext("2d"); | ||
| 1086 | - | ||
| 1087 | - var grayImageData = $rootScope.grayImageDataList[bodyRegionId - 1]; | 1083 | + var grayCanvasContext = grayCanvas.getContext("2d"); |
| 1088 | 1084 | ||
| 1089 | - grayCanvasContext.putImageData(grayImageData, 0, 0) | 1085 | + var grayImageData = $rootScope.grayImageDataList[bodyRegionId - 1]; |
| 1086 | + | ||
| 1087 | + grayCanvasContext.putImageData(grayImageData, 0, 0) | ||
| 1088 | + } | ||
| 1090 | } | 1089 | } |
| 1091 | 1090 | ||
| 1092 | var ActualTermNo = $scope.getActualTermNumber(RGBColor); | 1091 | var ActualTermNo = $scope.getActualTermNumber(RGBColor); |