Commit 4fc74dbc7d3544eb2dab28c438c1f82fb139a6fb
1 parent
222f5c84
issue resolved
Showing
1 changed file
with
11 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -6259,9 +6259,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
6259 | 6259 | |
6260 | 6260 | $scope.enableNormalMode = function () { |
6261 | 6261 | $("#btnTranparency").removeClass("disabled"); |
6262 | - | |
6262 | + console.log('$scope.isTransparencyActivated= ' + $scope.isTransparencyActivated + ', $scope.currentLayerNumber= ' + $scope.currentLayerNumber) | |
6263 | + if ($scope.isTransparencyActivated) { | |
6264 | + $scope.layerNumber = $scope.currentLayerNumber; | |
6265 | + } | |
6266 | + else { | |
6267 | + $scope.layerNumber = $('#txtlayerNumber').val(); | |
6268 | + } | |
6263 | 6269 | // $("#btnTranparency").remove("disabled"); |
6264 | 6270 | |
6271 | + $('#txtlayerNumber').val($scope.layerNumber) | |
6272 | + | |
6265 | 6273 | $rootScope.isNormalMode = false; |
6266 | 6274 | console.log('enableNormalMode is called'); |
6267 | 6275 | |
... | ... | @@ -6282,7 +6290,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
6282 | 6290 | |
6283 | 6291 | } |
6284 | 6292 | else { |
6285 | - | |
6293 | + | |
6286 | 6294 | //1. |
6287 | 6295 | $scope.flushCanvas(); |
6288 | 6296 | |
... | ... | @@ -6307,7 +6315,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
6307 | 6315 | |
6308 | 6316 | //7. |
6309 | 6317 | |
6310 | - $scope.layerNumber = $('#txtlayerNumber').val(); | |
6318 | + // $scope.layerNumber = $('#txtlayerNumber').val(); | |
6311 | 6319 | $scope.CalculateImageCordinates($rootScope.viewOrientationId); |
6312 | 6320 | // alert($rootScope.viewOrientationId + "gadash") |
6313 | 6321 | ... | ... |