Commit 06dca758b8573aa90f57eb9b8a0ec2cfae7144b1
1 parent
c935ddfc
black issue in transparency box is fixed.
Showing
1 changed file
with
10 additions
and
29 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| ... | ... | @@ -3782,41 +3782,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 3782 | 3782 | } |
| 3783 | 3783 | |
| 3784 | 3784 | |
| 3785 | - // niki 3june | |
| 3786 | - //var txtTransparencyChange = document.getElementById("txtTransparencyChange"); | |
| 3787 | - ////for first time, the transparency should be 50% | |
| 3788 | - //if ($scope.isTboxDrwan) { | |
| 3789 | - | |
| 3790 | - // if (txtTransparencyChange != null) | |
| 3791 | - // txtTransparencyChange.value = 50; | |
| 3792 | - | |
| 3793 | - // $scope.isTboxDrwan = false; | |
| 3794 | - | |
| 3795 | - //} | |
| 3796 | - | |
| 3797 | - //check if transparency is activated | |
| 3785 | + //check if transparency is activated | |
| 3798 | 3786 | |
| 3799 | 3787 | |
| 3800 | 3788 | var transNumber = $scope.transNumber;//txtTransparencyChange.value; |
| 3801 | 3789 | // debugger; |
| 3802 | - //this changes the transparency when transparency is already activated(on scale the value is >0) and user resizes or chage the layer | |
| 3790 | + //this changes the transparency when transparency is already activated and user resizes or chage the layer | |
| 3803 | 3791 | |
| 3804 | 3792 | var imageD = tempCtx.getImageData(0, 0, Width, Height); |
| 3805 | 3793 | |
| 3806 | - if (transNumber > 0) { | |
| 3807 | - // debugger; | |
| 3808 | - | |
| 3809 | - | |
| 3810 | - // tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId; | |
| 3794 | + | |
| 3811 | 3795 | var tempCtx = document.getElementById(tempCanvasID).getContext('2d'); |
| 3812 | 3796 | |
| 3813 | - // var image = ctx.getImageData(0, 0, scope.transparencyCanvasWidth, scope.transparencyCanvasHeight); | |
| 3814 | - | |
| 3815 | - | |
| 3816 | 3797 | //keep the original image on temp canavs to use it in changing transparency |
| 3817 | - // if (scope.isResized == true || scope.isLayerChanged) { | |
| 3818 | - //debugger; | |
| 3819 | - | |
| 3798 | + | |
| 3820 | 3799 | if (document.getElementById('tempCanvas') != null) { |
| 3821 | 3800 | var contx = document.getElementById('tempCanvas').getContext('2d'); |
| 3822 | 3801 | var tbTempCanvas = document.getElementById(tempCanvasID) |
| ... | ... | @@ -3851,8 +3830,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 3851 | 3830 | |
| 3852 | 3831 | tempCtx.putImageData(imageD, 0, 0); |
| 3853 | 3832 | |
| 3854 | - } | |
| 3855 | - | |
| 3833 | + | |
| 3856 | 3834 | var ctx = transparencyCanvas.getContext('2d'); |
| 3857 | 3835 | |
| 3858 | 3836 | |
| ... | ... | @@ -4948,14 +4926,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 4948 | 4926 | |
| 4949 | 4927 | if ($scope.isEligibleForHighlightBodyByTermList == true) { |
| 4950 | 4928 | //DISABLE PROGERSS BAR FOR GENDER OR VIEW CHANGE |
| 4951 | - if ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true) { | |
| 4929 | + // if ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true) { | |
| 4952 | 4930 | $scope.isLoading = false; |
| 4953 | 4931 | |
| 4954 | 4932 | $('#spinner').css('visibility', 'hidden'); |
| 4955 | - } | |
| 4933 | + //} | |
| 4956 | 4934 | |
| 4957 | 4935 | if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { |
| 4958 | 4936 | |
| 4937 | + $scope.isLoading = true; | |
| 4938 | + | |
| 4939 | + $('#spinner').css('visibility', 'visible'); | |
| 4959 | 4940 | $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100); |
| 4960 | 4941 | } |
| 4961 | 4942 | else if ($rootScope.isListManagerSelected == true) { | ... | ... |