diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 9740db1..2edf433 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -3782,41 +3782,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - // niki 3june - //var txtTransparencyChange = document.getElementById("txtTransparencyChange"); - ////for first time, the transparency should be 50% - //if ($scope.isTboxDrwan) { - - // if (txtTransparencyChange != null) - // txtTransparencyChange.value = 50; - - // $scope.isTboxDrwan = false; - - //} - - //check if transparency is activated + //check if transparency is activated var transNumber = $scope.transNumber;//txtTransparencyChange.value; // debugger; - //this changes the transparency when transparency is already activated(on scale the value is >0) and user resizes or chage the layer + //this changes the transparency when transparency is already activated and user resizes or chage the layer var imageD = tempCtx.getImageData(0, 0, Width, Height); - if (transNumber > 0) { - // debugger; - - - // tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId; + var tempCtx = document.getElementById(tempCanvasID).getContext('2d'); - // var image = ctx.getImageData(0, 0, scope.transparencyCanvasWidth, scope.transparencyCanvasHeight); - - //keep the original image on temp canavs to use it in changing transparency - // if (scope.isResized == true || scope.isLayerChanged) { - //debugger; - + if (document.getElementById('tempCanvas') != null) { var contx = document.getElementById('tempCanvas').getContext('2d'); var tbTempCanvas = document.getElementById(tempCanvasID) @@ -3851,8 +3830,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo tempCtx.putImageData(imageD, 0, 0); - } - + var ctx = transparencyCanvas.getContext('2d'); @@ -4948,14 +4926,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if ($scope.isEligibleForHighlightBodyByTermList == true) { //DISABLE PROGERSS BAR FOR GENDER OR VIEW CHANGE - if ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true) { + // if ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true) { $scope.isLoading = false; $('#spinner').css('visibility', 'hidden'); - } + //} if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { + $scope.isLoading = true; + + $('#spinner').css('visibility', 'visible'); $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100); } else if ($rootScope.isListManagerSelected == true) {