From 2977630ca49825a36acafd7a80243b94addc5d1b Mon Sep 17 00:00:00 2001 From: nikita Date: Thu, 16 Mar 2017 18:01:05 +0530 Subject: [PATCH] reverted the fix of bug 12159 and reinitializing updatedGrayList, etc in calculateImageCoordinates as this is the main entry point of all cases like view change, gender change, zoom,ect. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 6261663..b0f1aa3 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -922,7 +922,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else { $scope.ColoredImageSRC = []; } - + if ($rootScope.updatedGrayDataList != null && $rootScope.updatedGrayDataList != undefined) { + $rootScope.updatedGrayDataList = []; + } + if ($rootScope.updatedGrayMRDataList != null && $rootScope.updatedGrayMRDataList != undefined) { + $rootScope.updatedGrayMRDataList = []; + } + if ($rootScope.grayImageDataList != null && $rootScope.grayImageDataList != undefined) { + $rootScope.grayImageDataList = []; + } + if ($rootScope.grayImageMRDataList != null && $rootScope.grayImageMRDataList != undefined) { + $rootScope.grayImageMRDataList = []; + } //history code if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) { @@ -6564,10 +6575,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) { $scope.createTermListByPreviousTermsAndHighlight(); } - //else { - // $scope.isLoading = false; - // $('#spinner').css('visibility', 'hidden'); - //} + else { + $scope.isLoading = false; + $('#spinner').css('visibility', 'hidden'); + } } -- libgit2 0.21.4