ADAM / AIAHTML5

Commit 7d23cc171d146d08d52b6dbb334430cc450db2de

Authored by Nikita Kulshreshtha
1 parent 463d0f2a

fixed bug

Inline Side-by-side
Showing 1 changed file with 14 additions and 33 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @7d23cc1
... ... @@ -1431,15 +1431,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1431 1431 $scope.highLightBodyBasedOnIcolor(RGBColor);
1432 1432 }
1433 1433  
1434   - //if ($rootScope.isNormalMode == true) {
1435   -
1436   -
1437   - // $rootScope.previousHighlightList.push(RGBColor);
1438   - //}
1439   -
  1434 +
1440 1435 //extarct clicked body part is extarct button is already enabled.
1441   - // debugger;
  1436 +
1442 1437 if ($rootScope.isExtract == true) {
  1438 + if ($rootScope.multiAnnotationIsON == false) {
  1439 + $rootScope.isListManagerSelected = false;
  1440 + }
1443 1441 $scope.enableExtract(false);
1444 1442 }
1445 1443  
... ... @@ -1740,15 +1738,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1740 1738 //see the annotation apart from leaf then the actual click will be on modesty canvas, but for annotation er
1741 1739 //
1742 1740 else if (maskCanvasId.match('modestyImg') && RGBColor == '000000') {
1743   - //if ($rootScope.voId == 11) {
1744   - // maskCanvasId = 'imageCanvas6_mci';
1745   - // x = $('#imageCanvas6_mci').left;
1746   - // y = $('#imageCanvas6_mci').top;
1747   - //}
1748   - //else {
  1741 +
1749 1742 bodyRegionId = maskCanvasId.slice(-1);
1750 1743 maskCanvasId = 'imageCanvas' + bodyRegionId + '_mci';
1751   - // }
  1744 +
1752 1745 var maskCanvas = document.getElementById(maskCanvasId);
1753 1746 var maskCanvasContext = maskCanvas.getContext("2d");
1754 1747 RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y);
... ... @@ -1811,13 +1804,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1811 1804  
1812 1805 }
1813 1806  
1814   - //if ($rootScope.isNormalMode == true) {
1815   - // $rootScope.previousHighlightList.push(RGBColor);
1816   - //}
1817   -
1818   - // debugger;
  1807 +
1819 1808 //extarct clisked body part is extarct button is already enabled.
1820 1809 if ($rootScope.isExtract == true) {
  1810 + if ($rootScope.multiAnnotationIsON == false) {
  1811 + $rootScope.isListManagerSelected = false;
  1812 + }
1821 1813 $scope.enableExtract(false);
1822 1814 }
1823 1815  
... ... @@ -2065,7 +2057,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2065 2057 var CallBackBodyRegion = [];
2066 2058 var selectedAnnotation;
2067 2059  
2068   - if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0) && $rootScope.isListManagerSelected) {
  2060 + if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)
  2061 + && $rootScope.isListManagerSelected && $rootScope.multiAnnotationIsON == true) {
2069 2062  
2070 2063 multiTermList = $scope.AllTerms;
2071 2064 angular.forEach($rootScope.previousHighlightList, function (value, key) {
... ... @@ -6362,9 +6355,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6362 6355  
6363 6356 var imageCanvas = document.getElementById(id);
6364 6357  
6365   - //var coloredCanvasID = 'imageCanvas' + bodyRegionId;
6366   - //var coloredCanvas = document.getElementById(coloredCanvasID);
6367   -
  6358 +
6368 6359 var width = value.Width;
6369 6360 var ht = value.Height;
6370 6361  
... ... @@ -6373,16 +6364,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6373 6364 var coloredImageDataVar = coloredImageData;
6374 6365  
6375 6366  
6376   - //if (value.haveMirror == 'true') {
6377   - // $rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId)] = coloredImageDataVar;
6378   - //}
6379   - //else {
6380   -
6381   - // $rootScope.coloredImageCanvasList[parseInt(value.bodyRegionId - 1)] = coloredImageDataVar;
6382   -
6383   - //}
6384   -
6385   -
6386 6367 var context = imageCanvas.getContext('2d');
6387 6368  
6388 6369  
... ...