ADAM / AIAHTML5

Commit 6b765c458dc685f36066c9ae3cd71298908856cf

Authored by Nikita Kulshreshtha
1 parent 9a49c12f

right layer gets highlighted on switching from and to highlight and normal mode.… 

… need to see transaprnecy scae value as it goes to 100 when switch.
Inline Side-by-side
Showing 1 changed file with 26 additions and 18 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @6b765c4
... ... @@ -6043,18 +6043,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6043 6043 }
6044 6044 else {
6045 6045  
  6046 +
6046 6047 var tranparencyLayer;
6047   -
6048   - var currentLayer = $scope.GetwindowStoreData(windowviewid,'layerNumberBeforeTBDraw');
6049   -
6050   - var totalLayers=$scope.GetwindowStoreData(windowviewid,'totalLayers');
6051   - if (currentLayer == totalLayers) {
6052   - tranparencyLayer = currentLayer;
6053   - }
6054   - else {
6055   - tranparencyLayer = currentLayer + 1;
  6048 + if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && ($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked") == true || $scope.GetwindowStoreData(windowviewid, "isHighlightlBtnClicked") == true)) {
  6049 + tranparencyLayer = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
  6050 + $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', false);
  6051 + $scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', false);
6056 6052 }
  6053 + else{
  6054 + var currentLayer = $scope.GetwindowStoreData(windowviewid,'layerNumberBeforeTBDraw');
6057 6055  
  6056 + var totalLayers=$scope.GetwindowStoreData(windowviewid,'totalLayers');
  6057 + if (currentLayer == totalLayers) {
  6058 + tranparencyLayer = currentLayer;
  6059 + }
  6060 + else {
  6061 + tranparencyLayer = currentLayer + 1;
  6062 + }
  6063 + }
6058 6064 $scope.SetwindowStoreData(windowviewid,'layerNumber',tranparencyLayer);
6059 6065  
6060 6066 }
... ... @@ -8036,7 +8042,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8036 8042  
8037 8043 }
8038 8044  
8039   - $scope.enableHighlight = function (windowviewid) {
  8045 + $scope.enableHighlight = function (windowviewid) {
  8046 +
  8047 + $scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', true);
  8048 +
8040 8049 $scope.DisableUI();
8041 8050  
8042 8051 $('#btnTranparency_' + windowviewid).removeAttr('disabled', 'disabled');
... ... @@ -8112,18 +8121,17 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8112 8121 }
8113 8122  
8114 8123 $scope.enableNormalMode = function (windowviewid) {
8115   - $scope.SetwindowStoreData(windowviewid,'previousHighlightList',[]);
  8124 +
  8125 + $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', true);
  8126 +
  8127 + $scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []);
8116 8128  
8117 8129 $('#btnTranparency_' + windowviewid).removeClass("disabled");
8118 8130 $('#btnTranparency_' + windowviewid).css("pointer-events", "auto");
8119 8131  
8120   - if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
8121   - var currentLayerNumber=$scope.GetwindowStoreData(windowviewid,'currentLayerNumber');
8122   - $scope.SetwindowStoreData(windowviewid,'layerNumber',currentLayerNumber);
8123   - }
8124   - else {
  8132 +
8125 8133 $scope.SetwindowStoreData(windowviewid,'layerNumber',$("#txtLayerNumberDA_" + windowviewid).val());
8126   - }
  8134 +
8127 8135  
8128 8136 $('#txtLayerNumberDA_' + windowviewid).val($scope.GetwindowStoreData(windowviewid,'layerNumber'))
8129 8137  
... ... @@ -8147,7 +8155,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8147 8155 if ($scope.GetwindowStoreData(windowviewid, 'isTransparencyActivated')) {
8148 8156  
8149 8157 // $scope.CloseTransparencyBox(windowviewid);
8150   - $scope.GetwindowStoreData(windowviewid, 'isHighLight', false);
  8158 + $scope.SetwindowStoreData(windowviewid, 'isHighLight', false);
8151 8159 $scope.CalculateDimensionsAndDrawTBox(windowviewid);
8152 8160  
8153 8161 }
... ...