diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 07b6643..6c841d6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -39,9 +39,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.multiAnnotationIsON = true; $scope.previousGrayImageDataVar; $scope.previousGrayCanvas; - $scope.previousIcolor =0; - $scope.previousX =0; - $scope.previousY=0; + + $scope.previousSelectedTermList = []; + + + $scope.machedBodyRegion = []; //array for bodyviewid correspoing to male female(used for gender change) @@ -920,7 +922,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var termNumber = parseInt(TermList[i]._TermNumber); //Match Term No List in each bodyRegion - $scope.getLocationsForMatchedTermsInWholeBody(termNumber, x, y); + $scope.getLocationsForMatchedTermsInWholeBody(termNumber); } } @@ -1101,14 +1103,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } } + + // var IcolorWithCordinate = new Object; + var previousIcolor = RGBColor; + //var previousX; + // var previousY; - + //IcolorWithCordinate.previousIcolor= RGBColor; + // IcolorWithCordinate.previousX = x; + // IcolorWithCordinate.previousY = y; - $scope.previousIcolor= RGBColor; - $scope.previousX = x; - $scope.previousY = y; + $scope.previousSelectedTermList.push(previousIcolor); - $scope.highLightBodyBasedOnIcolor(RGBColor, x, y); + $scope.highLightBodyBasedOnIcolor(RGBColor); //var ActualTermNo = $scope.getActualTermNumber(RGBColor); ////3. Find Term No List Based on ActualTermNo @@ -1130,10 +1137,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else { - $scope.previousIcolor = RGBColor; - $scope.previousX = x; - $scope.previousY = y; - $scope.highLightBodyBasedOnIcolor(RGBColor,x,y); + $scope.highLightBodyBasedOnIcolor(RGBColor); ////2. Find Actul Term No Based on Icolor. //var ActualTermNo = $scope.getActualTermNumber(RGBColor); @@ -1231,11 +1235,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - $scope.highLightBodyBasedOnIcolor = function (RGBColor,x,y) + $scope.highLightBodyBasedOnIcolor = function (RGBColor) { //2. Find Actul Term No Based on Icolor. - var ActualTermNo = $scope.getActualTermNumber(RGBColor); + var ActualTermNo = $scope.getActualTermNumber(RGBColor); //3. Find Term No List Based on ActualTermNo var TermList = $scope.getTermNumberList(ActualTermNo); @@ -1249,11 +1253,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var termNumber = parseInt(TermList[i]._TermNumber); //Match Term No List in each bodyRegion - $scope.getLocationsForMatchedTermsInWholeBody(termNumber, x, y); + $scope.getLocationsForMatchedTermsInWholeBody(termNumber); } } - $scope.getLocationsForMatchedTermsInWholeBody = function (termNo, x, y) + $scope.getLocationsForMatchedTermsInWholeBody = function (termNo) { for (var x = 0; x < $scope.ColoredImageSRC.length; x++) @@ -1610,10 +1614,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $timeout(function () { $scope.highLightBody() }, 350); - if ($scope.previousIcolor != 0 && $scope.previousX != 0 && $scope.previousY != 0) { - - $timeout(function () { $scope.highLightBodyBasedOnIcolor($scope.previousIcolor, $scope.previousX, $scope.previousY) }, 350); - } + } @@ -2251,6 +2252,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } else if (isLayerChanged) { $scope.layerNumber = parseInt($('#txtlayerNumber').val()); + } else { var currentLayer = parseInt($('#txtlayerNumber').val()); @@ -3187,6 +3189,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // alert('length: '+ $scope.coloredImageCanvasList.length); } + + if ($scope.previousSelectedTermList.length > 0) { + for (var i = 0; i < $scope.previousSelectedTermList.length; i++) { + $scope.highLightBodyBasedOnIcolor($scope.previousSelectedTermList[i]) ; + + } + } } $scope.applyGrayMatrix = function (img, context_gray)