ADAM / AIAHTML5

Commit c0f761fffe3371e672b438073e83147f2e7a9394

Authored by Nikita Kulshreshtha
1 parent 8ee1ce16

highlight issue on layer change is fixed.

Inline Side-by-side
Showing 1 changed file with 28 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c0f761f
... ... @@ -1163,6 +1163,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1163 1163  
1164 1164 FlipedImgCanvas.addEventListener('click', function (evt) {
1165 1165  
  1166 + //to get correct data on multihighlight highlight
  1167 + if($scope.isLayerChange == true)
  1168 + {
  1169 + $scope.isLayerChange = false;
  1170 + }
  1171 +
1166 1172 if (evt.ctrlKey) {
1167 1173 $rootScope.multiAnnotationIsON = true;
1168 1174 }
... ... @@ -1401,12 +1407,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1401 1407  
1402 1408 $rootScope.isLoading = true;
1403 1409 $('#spinner').css('visibility', 'visible');
1404   - $timeout(function () {
  1410 + //$timeout(function () {
1405 1411 console.log('inside start of flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length)
1406 1412 $rootScope.isHighLight = true;
1407   -
1408   - $scope.highLightBody()
1409   - }, 500);
  1413 + console.log('just before highLightBody call');
  1414 + $scope.highLightBody();
  1415 + console.log('just after highLightBody call');
  1416 + //}, 500);
1410 1417 }
1411 1418 }
1412 1419 }
... ... @@ -1490,6 +1497,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1490 1497  
1491 1498 imgCanvas.addEventListener('click', function (evt) {
1492 1499  
  1500 +
  1501 + if ($scope.isLayerChange == true) {
  1502 + $scope.isLayerChange = false;
  1503 + }
  1504 +
1493 1505 if (evt.ctrlKey) {
1494 1506 $rootScope.multiAnnotationIsON = true;
1495 1507 }
... ... @@ -1730,12 +1742,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1730 1742  
1731 1743 $rootScope.isLoading = true;
1732 1744 $('#spinner').css('visibility', 'visible');
1733   - $timeout(function () {
  1745 + //$timeout(function () {
1734 1746 console.log('inside start of non flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length)
1735 1747 $rootScope.isHighLight = true;
1736   -
1737   - $scope.highLightBody()
1738   - }, 500);
  1748 + console.log('just before highLightBody call');
  1749 + $scope.highLightBody();
  1750 + console.log('just after highLightBody call');
  1751 + //}, 500);
1739 1752 }
1740 1753 }
1741 1754 }
... ... @@ -2024,7 +2037,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2024 2037  
2025 2038  
2026 2039 if ($rootScope.multiAnnotationIsON == true) {
2027   -
  2040 + //on layer change we need the fresh data not the updated one
2028 2041 if ($scope.isLayerChange == true) {
2029 2042 if ($rootScope.grayImageMRDataList[bodyRegionId] != null || $rootScope.grayImageMRDataList[bodyRegionId] != undefined) {
2030 2043 grayImageDataVar = $rootScope.grayImageMRDataList[bodyRegionId];
... ... @@ -2065,6 +2078,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2065 2078  
2066 2079 if ($rootScope.multiAnnotationIsON == true) {
2067 2080  
  2081 + //on layer change we need the fresh data not the updated one
2068 2082 if ($scope.isLayerChange == true) {
2069 2083 if ($rootScope.grayImageDataList[bodyRegionId - 1] != null || $rootScope.grayImageDataList[bodyRegionId - 1] != undefined) {
2070 2084 grayImageDataVar = $rootScope.grayImageDataList[bodyRegionId - 1];
... ... @@ -2432,7 +2446,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2432 2446 $('#btnHighLight').removeClass('btn btn-black');
2433 2447 $('#btnHighLight').addClass('btn-primary');
2434 2448  
2435   - $scope.highLightBody();
  2449 + console.log('highLightBody call from DisableProgressBar')
  2450 + // $scope.highLightBody();
2436 2451  
2437 2452  
2438 2453  
... ... @@ -4636,6 +4651,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4636 4651  
4637 4652 }
4638 4653 else {
  4654 + console.log('highLightBody from enableHighlight')
4639 4655 $timeout(function () { $scope.highLightBody() }, 50);
4640 4656 }
4641 4657  
... ... @@ -4709,6 +4725,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4709 4725 }
4710 4726  
4711 4727 //4.
  4728 + console.log('highLightBody from enableExtract')
4712 4729 $scope.highLightBody();
4713 4730  
4714 4731  
... ... @@ -6101,6 +6118,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6101 6118 if ($rootScope.isHighLight == false) {
6102 6119 //color the body gray
6103 6120 $rootScope.isHighLight = true
  6121 + console.log('highLightBody from HighlightBodysystem')
6104 6122 $scope.highLightBody();
6105 6123 }
6106 6124 //now highlight the selected body system in whole body
... ...