ADAM / AIAHTML5

Commit 2977630ca49825a36acafd7a80243b94addc5d1b

Authored by Nikita Kulshreshtha
1 parent 6346f5c0

reverted the fix of bug 12159 and reinitializing updatedGrayList, etc in calcula… 

…teImageCoordinates as this is the main entry point of all cases like view change, gender change, zoom,ect.
Inline Side-by-side
Showing 1 changed file with 16 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @2977630
... ... @@ -922,7 +922,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
922 922 else {
923 923 $scope.ColoredImageSRC = [];
924 924 }
925   -
  925 + if ($rootScope.updatedGrayDataList != null && $rootScope.updatedGrayDataList != undefined) {
  926 + $rootScope.updatedGrayDataList = [];
  927 + }
  928 + if ($rootScope.updatedGrayMRDataList != null && $rootScope.updatedGrayMRDataList != undefined) {
  929 + $rootScope.updatedGrayMRDataList = [];
  930 + }
  931 + if ($rootScope.grayImageDataList != null && $rootScope.grayImageDataList != undefined) {
  932 + $rootScope.grayImageDataList = [];
  933 + }
  934 + if ($rootScope.grayImageMRDataList != null && $rootScope.grayImageMRDataList != undefined) {
  935 + $rootScope.grayImageMRDataList = [];
  936 + }
926 937 //history code
927 938  
928 939 if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
... ... @@ -6564,10 +6575,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6564 6575 else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
6565 6576 $scope.createTermListByPreviousTermsAndHighlight();
6566 6577 }
6567   - //else {
6568   - // $scope.isLoading = false;
6569   - // $('#spinner').css('visibility', 'hidden');
6570   - //}
  6578 + else {
  6579 + $scope.isLoading = false;
  6580 + $('#spinner').css('visibility', 'hidden');
  6581 + }
6571 6582  
6572 6583 }
6573 6584  
... ...