Commit 7b06aac1ad6035183c8b3a25275d1009a77dcbc9
1 parent
efa24365
against Merge Request #804
Showing
1 changed file
with
5 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -4908,10 +4908,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
4908 | 4908 | |
4909 | 4909 | |
4910 | 4910 | //0. get current layer number |
4911 | - if (isResized) { | |
4911 | + if (isResized || isLayerChanged) { | |
4912 | 4912 | //do nothing |
4913 | - } | |
4914 | - else if (isLayerChanged) { | |
4913 | + $scope.transNumber = 100; | |
4914 | + $(".slider").slider('value', 100); | |
4915 | 4915 | |
4916 | 4916 | } |
4917 | 4917 | else { |
... | ... | @@ -5427,8 +5427,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
5427 | 5427 | |
5428 | 5428 | $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized) { |
5429 | 5429 | |
5430 | - | |
5431 | - | |
5432 | 5430 | var transNumber = $scope.transNumber;//txtTransparencyChange.value; |
5433 | 5431 | //this changes the transparency when transparency is already activated and user resizes or chage the layer |
5434 | 5432 | |
... | ... | @@ -5454,6 +5452,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
5454 | 5452 | //} |
5455 | 5453 | } |
5456 | 5454 | |
5455 | + | |
5456 | + | |
5457 | 5457 | // set every fourth value to the desired number of transparency |
5458 | 5458 | var imageD1 = tempCtx.getImageData(0, 0, Width, Height); |
5459 | 5459 | var imageData1 = imageD1.data; | ... | ... |