ADAM / AIAHTML5

Commit f8bc5ef8d587d2dbe364e22f09fd58fbd20c891f

Authored by Nikita Kulshreshtha
1 parent 1b778f0a

fixed in resize . issue in modesty.

Inline Side-by-side
Showing 1 changed file with 67 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @f8bc5ef
... ... @@ -4726,7 +4726,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4726 4726 }
4727 4727  
4728 4728 //set modesty image visiblility true/false as per layer
4729   -
  4729 + // if(bodyRegionId.match('modestyImg3'))
4730 4730  
4731 4731 var layerInfo = new jinqJs()
4732 4732 .from($scope.layerInfoForModesty)
... ... @@ -4758,6 +4758,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4758 4758  
4759 4759 }
4760 4760 }
  4761 +
4761 4762 }
4762 4763  
4763 4764 }
... ... @@ -5311,6 +5312,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5311 5312  
5312 5313 $scope.IncludedBodyRegions = [];
5313 5314 $scope.transparencyDrawnRegions = [];
  5315 + $scope.canThirdBRDrawn = false;
5314 5316 // $scope.layerNo = parseInt(document.getElementById(''))
5315 5317 var counter = 0;
5316 5318 $.each(BodyRegionDictionary, function (index, value) {
... ... @@ -5330,7 +5332,70 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5330 5332 if ($scope.isTBDrawnOnBodyRegion == false) {
5331 5333 $scope.layerNumber = $scope.layerNumber + 1;
5332 5334 }
5333   - $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);
  5335 +
  5336 + if (value.bodyRegionId == '3') {
  5337 +
  5338 + var BR6 = new jinqJs()
  5339 + .from($scope.transparencyDrawnRegions)
  5340 + .where('BRID == 6')
  5341 + .select();
  5342 +
  5343 + if (BR6 != null && BR6 != undefined && BR6.length > 0) {
  5344 +
  5345 + $scope.canThirdBRDrawn = true;
  5346 +
  5347 + }
  5348 +
  5349 +
  5350 + }
  5351 + //$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);
  5352 +
  5353 + if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
  5354 +
  5355 + $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);
  5356 + }
  5357 +
  5358 + else {
  5359 +
  5360 + if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == false) {
  5361 +
  5362 + //1. draw 6th
  5363 + var BRSixData = new jinqJs()
  5364 + .from(BodyRegionDictionary)
  5365 + .where('bodyRegionId == 6')
  5366 + .select();
  5367 + var isMirror = BRSixData[0].IsMirror;
  5368 + if (isMirror == 'Yes') {
  5369 + $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'Yes', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false);
  5370 + $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'No', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false);
  5371 + $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);
  5372 + // $scope.transparencyDrawnRegions.push({'BRID':'6'});
  5373 + }
  5374 + else {
  5375 + $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'No', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false);
  5376 + $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'Yes', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false);
  5377 + $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);
  5378 + // $scope.transparencyDrawnRegions.push({ 'BRID': '6' });
  5379 + }
  5380 + //$timeout(function () {
  5381 +
  5382 + // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  5383 +
  5384 + // }, 500);
  5385 +
  5386 + //2. draw 3rd
  5387 +
  5388 + }
  5389 + else {
  5390 + var BR6 = new jinqJs()
  5391 + .from($scope.transparencyDrawnRegions)
  5392 + .where('BRID == 6')
  5393 + .select();
  5394 + if (value.bodyRegionId == "6" && BR6 != undefined && BR6 != null && BR6.length > 0) { }
  5395 + else
  5396 + $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);
  5397 + }
  5398 + }
5334 5399 $scope.isTBDrawnOnBodyRegion = true;
5335 5400 }
5336 5401  
... ...