ADAM / AIAHTML5

Commit 25108a9d0fb9e5c7a89e89f50755e3debdd3c800

Authored by Amrita Vishnoi
2 parents 583d94c1 80a5a093

Merge branch 'BlackIssueInLateral' into Develop

Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @25108a9
... ... @@ -1445,6 +1445,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1445 1445  
1446 1446  
1447 1447 function start() {
  1448 +
1448 1449 context.save();
1449 1450 context.translate(w, 0);
1450 1451 context.scale(-1, 1);
... ... @@ -1808,8 +1809,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1808 1809  
1809 1810 context.drawImage(img, 0, 0);
1810 1811  
1811   -
1812   -
1813 1812 if (isMaskImage == 'N') {
1814 1813 if (bodyRegionId == 'modestyImg3' || bodyRegionId == 'modestyImg2') {
1815 1814 //do nothing
... ... @@ -5479,6 +5478,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5479 5478 context_gray.putImageData(imgData, 0, 0);
5480 5479 }
5481 5480  
  5481 + imageCanvas.style.visibility = 'visible';
5482 5482 //push BRID into array
5483 5483 $scope.grayedBR.push({ 'BRID': value.bodyRegionId });
5484 5484  
... ... @@ -5566,7 +5566,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5566 5566  
5567 5567 }
5568 5568  
5569   - $timeout(function () { imageCanvas.style.visibility = 'visible' }, 50);
  5569 + // $timeout(function () { imageCanvas.style.visibility = 'visible' }, 50);
5570 5570  
5571 5571 console.log('highlightboy. $rootScope.isExtract= '+$rootScope.isExtract+', $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length)
5572 5572 if ($rootScope.isExtract == true) {
... ... @@ -5680,7 +5680,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5680 5680 context.putImageData(imgData, 0, 0);
5681 5681 }
5682 5682  
5683   -
  5683 + imageCanvas.style.visibility = 'visible'
5684 5684 var grayImageData = context.getImageData(0, 0, width, ht);
5685 5685 var grayImageImageDataVar = grayImageData.data;
5686 5686  
... ... @@ -5705,7 +5705,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5705 5705 }
5706 5706 }
5707 5707  
5708   - $timeout(function () { imageCanvas.style.visibility = 'visible' }, 50);
  5708 + // $timeout(function () { imageCanvas.style.visibility = 'visible' }, 50);
5709 5709 }
5710 5710 })
5711 5711  
... ...