ADAM / AIAHTML5

Commit e41a9dbad1eff4cf2e2b9c4a5f30fccf424dd63e

Authored by Birendra
1 parent 7689becc

fixed bug in DA slider

Inline Side-by-side
Showing 1 changed file with 10 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e41a9db
... ... @@ -1163,15 +1163,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1163 1163 la =$scope.GetwindowStoreData(windviewid,'totalLayers');
1164 1164 var slideVal = la - ui.value;
1165 1165 $("#txtLayerNumberDA_" + windviewid).val(slideVal);
1166   -
  1166 + if ($scope.GetwindowStoreData(windviewid, 'isTransparent')) {
  1167 + $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', slideVal);
  1168 + }
1167 1169 $scope.SetwindowStoreData(windviewid,'layerNumber',slideVal);
1168 1170 scope.LayerChange(windviewid);
1169 1171 $("#annotationpaintbrushsize").removeClass("activebtncolor");
1170 1172 $("#annotationpainteraser").removeClass("activebtncolor");
1171 1173  
1172   - if ($scope.GetwindowStoreData(windviewid, 'isTransparent')) {
1173   - $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', slideVal);
1174   - }
  1174 +
1175 1175 });
1176 1176 },
1177 1177  
... ... @@ -6785,16 +6785,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6785 6785 var WidthforTransImage = TBImageDimensions.WidthforTransImageTB;
6786 6786 var HeightforTransImage = TBImageDimensions.HeightforTransImageTB;
6787 6787 var YforTransImage = TBImageDimensions.YforTransImageTB;
6788   -
  6788 + var tranparencyLayer;
6789 6789 //0. get current layer number
6790 6790 if (isResized || isLayerChanged) {
6791 6791 //do nothing
6792 6792 $scope.SetwindowStoreData(windowviewid,'transNumber',100);
6793 6793 $("#tbSlider_" + windowviewid).slider('value', 100);
  6794 + if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && $scope.GetwindowStoreData(windowviewid, "isTransparent") == true) {
  6795 + tranparencyLayer = $scope.GetwindowStoreData(windowviewid, 'layerNumberTransparency');
  6796 + }
6794 6797  
6795 6798 }
6796   - else {
6797   - var tranparencyLayer;
  6799 + else {
6798 6800 if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && (($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked") == true || $scope.GetwindowStoreData(windowviewid, "isHighlightlBtnClicked") == true)) ){
6799 6801 tranparencyLayer = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
6800 6802 $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', false);
... ... @@ -6818,6 +6820,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6818 6820 $scope.SetwindowStoreData(windowviewid,'layerNumber',tranparencyLayer);
6819 6821 $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', tranparencyLayer);
6820 6822 }
  6823 +
6821 6824 var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers');
6822 6825 var sliderVal = parseInt(totalayer) - parseInt(tranparencyLayer);
6823 6826  
... ...