Commit 2316baf3488a8b2705098037d2759a724e202237

Authored by Amrita Vishnoi
2 parents ce4da6fd 222f5c84

Merge branch 'TBCut123' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... ... @@ -2972,7 +2972,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2972 2972  
2973 2973 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
2974 2974  
2975   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  2975 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
2976 2976 }
2977 2977  
2978 2978 else {
... ... @@ -2987,22 +2987,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2987 2987 var isMirror = BRSixData[0].IsMirror;
2988 2988 if (isMirror == 'Yes') {
2989 2989 //draw mirror arm
2990   - $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'Yes', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
  2990 + $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'Yes', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
2991 2991 //draw non mirror arm
2992   - $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'No', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
  2992 + $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'No', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
2993 2993 //draw 3rd BR
2994   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
2995   -
  2994 + $timeout(function () {
  2995 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
  2996 + },200);
2996 2997  
2997 2998 }
2998 2999 else {
2999 3000 //draw mirror arm
3000   - $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'No', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
  3001 + $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'No', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
3001 3002 //draw non mirror arm
3002   - $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'Yes', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
  3003 + $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'Yes', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
3003 3004 //draw 3rd BR
3004   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
3005   -
  3005 + $timeout(function () {
  3006 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
  3007 + }, 200);
3006 3008 }
3007 3009  
3008 3010 }
... ... @@ -3013,7 +3015,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3013 3015 .select();
3014 3016 if (value.bodyRegionId == "6" && BR_SixTBData != undefined && BR_SixTBData != null && BR_SixTBData.length > 0) { }
3015 3017 else
3016   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
  3018 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
3017 3019 }
3018 3020 }
3019 3021  
... ... @@ -4034,16 +4036,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4034 4036  
4035 4037 if (($rootScope.voId == "9" || $rootScope.voId == "11")) {
4036 4038 if (value.bodyRegionId == "6") {
4037   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4039 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
4038 4040 }
4039 4041 else {
4040   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4042 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
4041 4043 }
4042 4044 }
4043 4045 else {
4044 4046 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
4045 4047  
4046   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4048 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
4047 4049 }
4048 4050  
4049 4051 else {
... ... @@ -4058,21 +4060,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4058 4060 var isMirror = BRSixData[0].IsMirror;
4059 4061 if (isMirror == 'Yes') {
4060 4062 //draw mirror arm
4061   - $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'Yes', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4063 + $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'Yes', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
4062 4064 //draw non mirror arm
4063   - $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'No', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4065 + $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'No', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
4064 4066 //draw 3rd BR
4065   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
4066   -
  4067 + $timeout(function () {
  4068 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
  4069 + }, 200);
4067 4070 }
4068 4071 else {
4069 4072 //draw mirror arm
4070   - $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'No', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4073 + $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'No', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
4071 4074 //draw mirror arm
4072   - $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'Yes', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4075 + $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'Yes', $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
4073 4076 //draw mirror arm
4074   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
4075   -
  4077 + $timeout(function () {
  4078 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
  4079 + }, 200);
4076 4080 }
4077 4081  
4078 4082 }
... ... @@ -4083,7 +4087,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4083 4087 .select();
4084 4088 if (value.bodyRegionId == "6" && BR_SixTBData != undefined && BR_SixTBData != null && BR_SixTBData.length > 0) { }
4085 4089 else
4086   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4090 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false);
4087 4091 }
4088 4092 }
4089 4093  
... ... @@ -4218,7 +4222,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4218 4222 }
4219 4223 }
4220 4224  
4221   - $scope.loadTransparencyImage = function (bodyRegionId, Height, Width, X, Y, IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, scope, isLayerChanged, isTransparencyChanged) {
  4225 + $scope.loadTransparencyImage = function (bodyRegionId, Height, Width, X, Y, IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, scope, isLayerChanged, isTransparencyChanged, isResized) {
4222 4226  
4223 4227  
4224 4228 var transparencyCanvas = document.getElementById('transparencyCanvas');
... ... @@ -4241,7 +4245,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4241 4245 var YforTransImage = TBImageDimensions.YforTransImageTB;
4242 4246  
4243 4247 //0. get current layer number
4244   - if ($scope.isResized) {
  4248 + if (isResized) {
4245 4249 //do nothing
4246 4250 }
4247 4251 else if (isLayerChanged) {
... ... @@ -4507,38 +4511,46 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4507 4511  
4508 4512 //set modesty image visiblility true/false as per layer
4509 4513 // if(bodyRegionId.match('modestyImg3'))
  4514 + var BRID='';
  4515 + if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId)!=null) {
  4516 + BRID = bodyRegionId[bodyRegionId.length - 1];
  4517 + }
  4518 + else if ((bodyRegionId == '2' || bodyRegionId == '3') && document.getElementById('modestyTransCanavs_modestyImg' + bodyRegionId) != null) {
  4519 + BRID = bodyRegionId;
  4520 + }
  4521 + if (BRID != '') {
  4522 + var layerInfo = new jinqJs()
  4523 + .from($scope.layerInfoForModesty)
  4524 + .where('bodyRegionId == ' + BRID)
  4525 + .select();
  4526 + if (layerInfo != undefined && layerInfo.length > 0) {
  4527 + var lowerlayerNumberForModesty = layerInfo[0].lowerlayerNumberForModesty;
  4528 + var HigherlayerNumberForModesty = layerInfo[0].HigherlayerNumberForModesty;
4510 4529  
4511   - var layerInfo = new jinqJs()
4512   - .from($scope.layerInfoForModesty)
4513   - .where('bodyRegionId == ' + bodyRegionId)
4514   - .select();
4515   - if (layerInfo != undefined && layerInfo.length > 0) {
4516   - var lowerlayerNumberForModesty = layerInfo[0].lowerlayerNumberForModesty;
4517   - var HigherlayerNumberForModesty = layerInfo[0].HigherlayerNumberForModesty;
4518   -
4519   - var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
  4530 + var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
4520 4531  
4521   - if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
4522   - for (var j = 0; j < modestyTransCanvases.length; j++) {
  4532 + if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
  4533 + for (var j = 0; j < modestyTransCanvases.length; j++) {
4523 4534  
4524   - if (modestyTransCanvases[j].id.match(bodyRegionId)) {
  4535 + if (modestyTransCanvases[j].id.match(bodyRegionId)) {
4525 4536  
4526   - var modestyCanavs = document.getElementById(modestyTransCanvases[j].id);
  4537 + var modestyCanavs = document.getElementById(modestyTransCanvases[j].id);
4527 4538  
4528   - if ((parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) {
  4539 + if ((parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) {
4529 4540  
4530   - modestyCanavs.style.visibility = 'visible';
4531   - }
4532   - else {
  4541 + modestyCanavs.style.visibility = 'visible';
  4542 + }
  4543 + else {
4533 4544  
4534   - modestyCanavs.style.visibility = 'hidden';
  4545 + modestyCanavs.style.visibility = 'hidden';
4535 4546  
  4547 + }
4536 4548 }
4537   - }
4538 4549  
  4550 + }
4539 4551 }
4540   - }
4541 4552  
  4553 + }
4542 4554 }
4543 4555  
4544 4556 }
... ... @@ -4753,11 +4765,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4753 4765 }
4754 4766 }
4755 4767 else {
4756   - imageData[i] = ((255) * (parseInt(transNumber))) / 100;
  4768 +
  4769 + imageData[i] = ((255) * (parseInt(transNumber))) / 100;
4757 4770 }
4758   - }
4759   -
4760 4771  
  4772 +
  4773 + }
  4774 +
4761 4775 tempCtx.putImageData(imageD, 0, 0);
4762 4776  
4763 4777  
... ... @@ -4784,6 +4798,29 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4784 4798 // var ctx = transparencyCanvas.getContext('2d');
4785 4799 ctx.drawImage(tmpCanvasContext, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage)
4786 4800  
  4801 +
  4802 + if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  4803 +
  4804 + var imageD1 = ctx.getImageData(0, 0, Width, Height);
  4805 + var imageData1 = imageD1.data;
  4806 + var length1 = imageData1.length;
  4807 +
  4808 +
  4809 + // set every fourth value to the desired number of transparency
  4810 + for (var i = 0; i < imageData1.length; i += 4) {
  4811 + if (imageData1[i] == imageData1[i + 1] && imageData1[i + 1] == imageData1[i + 2] && imageData1[i + 2] === 0) {
  4812 + imageData1[i + 3] = 0;
  4813 + }
  4814 +
  4815 + }
  4816 +
  4817 +
  4818 + ctx.putImageData(imageD1, 0, 0);
  4819 +
  4820 + }
  4821 +
  4822 +
  4823 +
4787 4824 // $scope.transparencyDrawnRegions.push(bodyRegionId);
4788 4825 $scope.transparencyDrawnRegions.push({ 'BRID': bodyRegionId });
4789 4826  
... ... @@ -5043,8 +5080,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5043 5080 }
5044 5081 }
5045 5082  
5046   - $scope.isResized = true;
5047   -
  5083 +
5048 5084 if (tCanvasHeight != $scope.transparencyCanvasHeight || tCanvasWidth != $scope.transparencyCanvasWidth) {
5049 5085  
5050 5086  
... ... @@ -5135,7 +5171,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5135 5171  
5136 5172 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
5137 5173  
5138   - $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);
  5174 + $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);
5139 5175 }
5140 5176  
5141 5177 else {
... ... @@ -5150,20 +5186,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5150 5186 var isMirror = BRSixData[0].IsMirror;
5151 5187 if (isMirror == 'Yes') {
5152 5188 //draw mirror arm
5153   - $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);
  5189 + $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, true);
5154 5190 //draw non mirror arm
5155   - $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);
  5191 + $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, true);
5156 5192 //draw 3rd BR
5157   - $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);
5158   -
  5193 + $timeout(function () {
  5194 + $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);
  5195 + },200);
5159 5196 }
5160 5197 else {
5161 5198 //draw mirror arm
5162   - $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);
  5199 + $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, true);
5163 5200 //draw non mirror arm
5164   - $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);
  5201 + $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, true);
5165 5202 //draw 3rd BR
5166   - $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);
  5203 + $timeout(function () {
  5204 + $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);
  5205 + }, 200);
5167 5206 }
5168 5207  
5169 5208  
... ... @@ -5177,7 +5216,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5177 5216 //do not draw 6 BR again, its already drawn
5178 5217 }
5179 5218 else
5180   - $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);
  5219 + $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);
5181 5220 }
5182 5221 }
5183 5222 $scope.isTBDrawnOnBodyRegion = true;
... ... @@ -5204,13 +5243,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5204 5243 if (TBStartX <= bodyRegionRight && value.x <= TBRight && TBStartY <= bodyRegionBottom && value.y <= TBBottom) {
5205 5244  
5206 5245  
5207   - $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);
  5246 + $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);
5208 5247  
5209 5248 }
5210 5249 })
5211 5250 }
5212   -
5213   - $scope.isResized = false;
  5251 +
5214 5252 }
5215 5253  
5216 5254  
... ...