diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index ae2a01e..faed61c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -49,7 +49,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.zoomInOut = 75; $scope.i = 0; $scope.speachBubbleArray = []; - $rootScope.multiAnnotationIsON = false; + $scope.multiAnnotationIsON = false; $scope.previousGrayImageDataVar; $scope.previousGrayCanvas; @@ -471,7 +471,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //calculate coordinates for body region images $scope.CalculateImageCordinates = function (viewOrientationId) { - debugger; + // debugger; //remove the previous layer mask data from array var n = $rootScope.MaskCanvasData.length @@ -1401,7 +1401,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.highLightBodyBasedOnIcolor = function (RGBColor) { // debugger; - //terminate previous running workers to create space for new workers + var workerCount = $scope.runningWorkers.length; if (workerCount > 0) { for (var i = workerCount - 1; i >= 0; i--) { @@ -1422,7 +1422,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //4. - $scope.machedTermNoLocation = []; + $scope.HighlightBodyByTermList(TermList); + + + } + + $scope.HighlightBodyByTermList = function (TermList) { + + + //terminate previous running workers to create space for new workers + var workerCount = $scope.runningWorkers.length; + if (workerCount > 0) { + for (var i = workerCount - 1; i >= 0; i--) { + var runningWorker = $scope.runningWorkers[i].workerName; + runningWorker.terminate(); + $scope.runningWorkers.splice(i, 1); + // workerCount--; + } + } var n = $rootScope.MaskCanvasData.length; @@ -1466,6 +1483,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } + + grayImageDataVar = $rootScope.grayImageMRDataListCurrent[bodyRegionId] + } + else + grayImageDataVar = $rootScope.whiteImageMRDataList[bodyRegionId]; + } } else { @@ -1492,6 +1515,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo grayImageDataVar = $rootScope.grayImageDataList[bodyRegionId - 1]; } + if ($rootScope.isExtract) { + if ($scope.multiAnnotationIsON == true) { + + grayImageDataVar = $rootScope.grayImageDataListCurrent[bodyRegionId] + } + else + grayImageDataVar = $rootScope.whiteImageDataList[bodyRegionId]; + } } if ($rootScope.isExtract == true) @@ -3410,7 +3441,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // debugger; var zeroPoint = new Point(); - DAData.applyFilter(DAData, DAData.rect, zeroPoint, colorMode); + var grayScale = new ColorMatrixFilter(matrix); + DAData.applyFilter(DAData, DAData.rect, zeroPoint, grayScale); context_gray.putImageData(DAData.data, 0, 0) @@ -3470,6 +3502,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } + // for (var i = 0; i < $scope.previousSelectedTermList.length; i++) { + // $scope.highLightBodyBasedOnIcolor($scope.previousSelectedTermList[i]); + + // } + //} } @@ -3829,17 +3866,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.highLightBody(); //now highlight the selected body system in whole body - var termNumber = parseInt(systemMatchedTermList[0]._TermNumber); - //Match Term No List in each bodyRegion - $scope.getLocationsForMatchedTermsInWholeBody(termNumber); - //for (var i = 0; i < systemMatchedTermList.length; i++) { + $timeout(function(){ $scope.HighlightBodyByTermList(systemMatchedTermList)},100); - // var termNumber = parseInt(systemMatchedTermList[i]._TermNumber); - - // //Match Term No List in each bodyRegion - // $scope.getLocationsForMatchedTermsInWholeBody(termNumber, 0, 0); - //} } }] diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css index d889eac..fc10dcd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css +++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css @@ -395,7 +395,7 @@ footer.dark { width: 110px; padding-top: 20px; /*overflow: hidden;*/ - position: fixed !important; + position: absolute !important; left: 0; /*nk*/ /*top: 70px;*/