ADAM / AIAHTML5

Commit 5fbc9df7ccedf454a08434ebdc1f2641e3452f15

Authored by Nikita Kulshreshtha
1 parent 6e6effe3

this bug is fixed.need to do impact analyis one more time

Inline Side-by-side
Showing 1 changed file with 22 additions and 13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @5fbc9df
... ... @@ -3314,10 +3314,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3314 3314 //var transNumber = parseInt(document.getElementById("txtTransparencyChange").value);
3315 3315  
3316 3316 $scope.layerNumber = parseInt(txtlayerNumber.value);
3317   -
  3317 + if (($rootScope.voId == "9" || $rootScope.voId == "11" || $rootScope.voId == "2" || $rootScope.voId == "3" || $rootScope.voId == "6" || $rootScope.voId == "7")) {
  3318 + if (value.bodyRegionId == "6") {
  3319 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, true, false, false);
  3320 + }
  3321 + else {
  3322 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, true, false, false);
  3323 + }
  3324 + }
  3325 + else {
3318 3326 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
3319 3327  
3320   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
  3328 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
3321 3329 }
3322 3330  
3323 3331 else {
... ... @@ -3363,6 +3371,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3363 3371 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
3364 3372 }
3365 3373 }
  3374 + }
3366 3375  
3367 3376 }
3368 3377  
... ... @@ -5526,16 +5535,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5526 5535  
5527 5536 }
5528 5537 //$scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false);
5529   - //if (($rootScope.voId == "9" || $rootScope.voId == "11" || $rootScope.voId == "2" || $rootScope.voId == "3" || $rootScope.voId == "6" || $rootScope.voId == "7")) {
5530   - // if (value.bodyRegionId == "6") {
5531   - // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
5532   - // }
5533   - // else {
5534   - // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
5535   - // }
5536   - //}
5537   - // else
5538   - // {
  5538 + if (($rootScope.voId == "9" || $rootScope.voId == "11" || $rootScope.voId == "2" || $rootScope.voId == "3" || $rootScope.voId == "6" || $rootScope.voId == "7")) {
  5539 + if (value.bodyRegionId == "6") {
  5540 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true);
  5541 + }
  5542 + else {
  5543 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true);
  5544 + }
  5545 + }
  5546 + else
  5547 + {
5539 5548 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
5540 5549  
5541 5550 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true);
... ... @@ -5586,7 +5595,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5586 5595 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true);
5587 5596 }
5588 5597 }
5589   - // }
  5598 + }
5590 5599 $scope.isTBDrawnOnBodyRegion = true;
5591 5600 }
5592 5601  
... ...