diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 02e9323..15f1692 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -6259,9 +6259,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.enableNormalMode = function () { $("#btnTranparency").removeClass("disabled"); - + console.log('$scope.isTransparencyActivated= ' + $scope.isTransparencyActivated + ', $scope.currentLayerNumber= ' + $scope.currentLayerNumber) + if ($scope.isTransparencyActivated) { + $scope.layerNumber = $scope.currentLayerNumber; + } + else { + $scope.layerNumber = $('#txtlayerNumber').val(); + } // $("#btnTranparency").remove("disabled"); + $('#txtlayerNumber').val($scope.layerNumber) + $rootScope.isNormalMode = false; console.log('enableNormalMode is called'); @@ -6282,7 +6290,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } else { - + //1. $scope.flushCanvas(); @@ -6307,7 +6315,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //7. - $scope.layerNumber = $('#txtlayerNumber').val(); + // $scope.layerNumber = $('#txtlayerNumber').val(); $scope.CalculateImageCordinates($rootScope.viewOrientationId); // alert($rootScope.viewOrientationId + "gadash")