diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index e47132a..581c861 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1039,6 +1039,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo { $scope.multiAnnotationIsON = true; } + else + { + $scope.multiAnnotationIsON = false; + } // debugger; var annotationText; @@ -3108,7 +3112,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo img.src = dataURL; - var DAData = new BitmapData(img.width, img.height); DAData.draw(img); var RED = 0.3086; // luminance contrast value for red @@ -3133,7 +3136,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var grayImageData = context_gray.getImageData(0, 0, width, ht); var grayImageImageDataVar = grayImageData.data; - if (value.haveMirror == 'true') { $rootScope.grayImageMRDataList[parseInt(value.bodyRegionId)] = grayImageData; } @@ -3150,6 +3152,33 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } + $scope.applyGrayMatrix = function (img, context_gray) + { + var DAData = new BitmapData(img.width, img.height); + DAData.draw(img); + var RED = 0.3086; // luminance contrast value for red + var GREEN = 0.694; // luminance contrast value for green + var BLUE = 0.0820; // luminance contrast value for blue + + var RGB = [RED, GREEN, BLUE, 0, 0]; + var RGB2 = [RED, GREEN, BLUE, 0, 0]; + var RGB3 = [RED, GREEN, BLUE, 0, 0]; + var ALPHA = [0, 0, 0, 1, 0]; + + var rgbPx = RGB.concat(RGB2); + var rgbPx2 = rgbPx.concat(RGB3); + var matrix = rgbPx2.concat(ALPHA); + + var zeroPoint = new Point(); + var grayScale = new ColorMatrixFilter(matrix); + DAData.applyFilter(DAData, DAData.rect, zeroPoint, grayScale); + + context_gray.putImageData(DAData.data, 0, 0) + + var grayImageData = context_gray.getImageData(0, 0, width, ht); + var grayImageImageDataVar = grayImageData.data; + + } $scope.getActualTermNumber = function (iColor) { $scope.actualTermNo = new jinqJs()