ADAM / AIAHTML5

Commit c08a6de0a71018fd18f82ef54fbf251f27919a2e

Authored by unknown
2 parents d521da02 055f2366

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into CanvasSwitching

Inline Side-by-side
Showing 1 changed file with 43 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c08a6de
... ... @@ -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');
... ... @@ -5160,6 +5174,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5160 5174 }
5161 5175 }
5162 5176  
  5177 + // #7972 Mozilla Firefox> Incorrect navigation
  5178 + $("#canvasDiv").scroll(function (event) {
  5179 + $rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop();
  5180 + $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
  5181 +
  5182 + });
  5183 +
  5184 +
  5185 +
5163 5186 $scope.enableExtract = function (isCalledFromButton) {
5164 5187  
5165 5188 console.log('isCalledFromButton= ' + isCalledFromButton);
... ... @@ -5607,6 +5630,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5607 5630  
5608 5631 context.putImageData(DAData.data, 0, 0)
5609 5632  
  5633 +
  5634 + //NIKI- to resolve lateral arm black issue in mode
  5635 +
  5636 + if ($rootScope.viewOrientationId == 5 && (value.bodyRegionId == 6 || value.bodyRegionId == 4)) {
  5637 +
  5638 + var imgData = context.getImageData(0, 0, width, ht);
  5639 + var data = imgData.data;
  5640 + var c = 0;
  5641 + for (var i = 0; i < data.length; i += 4) {
  5642 + if (data[i] == data[i + 1] && data[i + 1] == data[i + 2] && data[i + 2] === 0) {
  5643 + data[i + 3] = 0;
  5644 + }
  5645 +
  5646 + }
  5647 + context.putImageData(imgData, 0, 0);
  5648 + }
  5649 +
  5650 +
5610 5651 var grayImageData = context.getImageData(0, 0, width, ht);
5611 5652 var grayImageImageDataVar = grayImageData.data;
5612 5653  
... ...