ADAM / AIAHTML5

Commit 5e3962abd12d1a66feea061bb83d323c181fe458

Authored by Nikita Kulshreshtha
1 parent 59581a41

Refs: #6908 

Search then extract then change layer did not maintain extraction. - Fixed.
Inline Side-by-side
Showing 1 changed file with 34 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @5e3962a
... ... @@ -1505,7 +1505,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1505 1505 }
1506 1506  
1507 1507 if ($scope.isEligibleForHighlight == true) {
1508   - if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
  1508 + if ($scope.isExtract == true) {
  1509 + $rootScope.isLoading = true;
  1510 + $('#spinner').css('visibility', 'visible');
  1511 + $scope.highLightBody();
  1512 + }
  1513 + else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $rootScope.isHighlightBodyByBodySystem == true) {
  1514 +
  1515 + console.log('1. $rootScope.isHighLight= ' + $rootScope.isHighLight)
1509 1516  
1510 1517 $rootScope.isLoading = true;
1511 1518 $('#spinner').css('visibility', 'visible');
... ... @@ -1853,10 +1860,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1853 1860 $scope.isEligibleForHighlight = false;
1854 1861 }
1855 1862  
  1863 +
1856 1864 if ($scope.isEligibleForHighlight == true) {
1857 1865  
1858   - if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
  1866 + if ($scope.isExtract == true) {
  1867 + $rootScope.isLoading = true;
  1868 + $('#spinner').css('visibility', 'visible');
  1869 + $scope.highLightBody();
  1870 + }
  1871 + else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
1859 1872  
  1873 + console.log('2. $rootScope.isHighLight= ' + $rootScope.isHighLight)
1860 1874  
1861 1875 $rootScope.isLoading = true;
1862 1876 $('#spinner').css('visibility', 'visible');
... ... @@ -5575,6 +5589,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5575 5589  
5576 5590 context.putImageData(DAData.data, 0, 0)
5577 5591  
  5592 +
  5593 + //NIKI- to resolve lateral arm black issue in mode
  5594 +
  5595 + if ($rootScope.viewOrientationId == 5 && (value.bodyRegionId == 6 || value.bodyRegionId == 4)) {
  5596 +
  5597 + var imgData = context.getImageData(0, 0, width, ht);
  5598 + var data = imgData.data;
  5599 + var c = 0;
  5600 + for (var i = 0; i < data.length; i += 4) {
  5601 + if (data[i] == data[i + 1] && data[i + 1] == data[i + 2] && data[i + 2] === 0) {
  5602 + data[i + 3] = 0;
  5603 + }
  5604 +
  5605 + }
  5606 + context.putImageData(imgData, 0, 0);
  5607 + }
  5608 +
  5609 +
5578 5610 var grayImageData = context.getImageData(0, 0, width, ht);
5579 5611 var grayImageImageDataVar = grayImageData.data;
5580 5612  
... ...