diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index bd074a1..48e6a79 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1163,15 +1163,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l la =$scope.GetwindowStoreData(windviewid,'totalLayers'); var slideVal = la - ui.value; $("#txtLayerNumberDA_" + windviewid).val(slideVal); - + if ($scope.GetwindowStoreData(windviewid, 'isTransparent')) { + $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', slideVal); + } $scope.SetwindowStoreData(windviewid,'layerNumber',slideVal); scope.LayerChange(windviewid); $("#annotationpaintbrushsize").removeClass("activebtncolor"); $("#annotationpainteraser").removeClass("activebtncolor"); - if ($scope.GetwindowStoreData(windviewid, 'isTransparent')) { - $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', slideVal); - } + }); }, @@ -6785,16 +6785,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var WidthforTransImage = TBImageDimensions.WidthforTransImageTB; var HeightforTransImage = TBImageDimensions.HeightforTransImageTB; var YforTransImage = TBImageDimensions.YforTransImageTB; - + var tranparencyLayer; //0. get current layer number if (isResized || isLayerChanged) { //do nothing $scope.SetwindowStoreData(windowviewid,'transNumber',100); $("#tbSlider_" + windowviewid).slider('value', 100); + if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && $scope.GetwindowStoreData(windowviewid, "isTransparent") == true) { + tranparencyLayer = $scope.GetwindowStoreData(windowviewid, 'layerNumberTransparency'); + } } - else { - var tranparencyLayer; + else { if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && (($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked") == true || $scope.GetwindowStoreData(windowviewid, "isHighlightlBtnClicked") == true)) ){ tranparencyLayer = parseInt($('#txtLayerNumberDA_' + windowviewid).val()); $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', false); @@ -6818,6 +6820,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.SetwindowStoreData(windowviewid,'layerNumber',tranparencyLayer); $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', tranparencyLayer); } + var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers'); var sliderVal = parseInt(totalayer) - parseInt(tranparencyLayer);