From efca5b367ff540afc24c08aa9066c69711be389f Mon Sep 17 00:00:00 2001 From: nikita Date: Wed, 20 Dec 2017 15:09:19 +0530 Subject: [PATCH] removed the enableUI code if body view is not drawn fully --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 000320d..a5c5d08 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1860,14 +1860,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } ); } - //else if ($scope.ColoredImageSRC.length == totalCanvas) - //{ - // // dispatch event for enabling rest UI - // alert('all canvas drawn'); - // $scope.EnableUI(); - //} - - //-NIKI-for solving extarct issue 8286 + var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR'); @@ -1883,11 +1876,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } - - // - - // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length) - + if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) { if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) { @@ -1931,18 +1920,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.highLightBody(); } else { + + //This block is executed when normal body is created and no further process like highlight,extract, etc $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); - //debugger; + $scope.EnableUI(); + } } - else { - $rootScope.isLoading = false; - $('#spinner').css('visibility', 'hidden'); - //debugger; - $scope.EnableUI(); - } + } console.log('DrawMirroredImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); @@ -2299,8 +2286,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l ); } - //-NIKI-for solving extarct issue 8286 - + var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId); if (imageCanvas != null || imageCanvas != undefined) { @@ -2314,9 +2300,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar; } - // - - + if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) { if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) { @@ -2367,18 +2351,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } else { + //This block is executed when normal body is created and no further process like highlight,extract, etc $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); - //debugger; $scope.EnableUI(); } } - else { - $rootScope.isLoading = false; - $('#spinner').css('visibility', 'hidden'); - //debugger; - $scope.EnableUI(); - } + } console.log('DrawImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); -- libgit2 0.21.4