ADAM / AIAHTML5

Commit 164d38be03ec527a2087f92b4d13f72e5c8fe642

Authored by Amrita Vishnoi
2 parents 542452c8 c374b976

Merge branch 'TBCut2' into Develop

Inline Side-by-side
Showing 1 changed file with 203 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @164d38b
... ... @@ -2874,10 +2874,30 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2874 2874  
2875 2875 var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData;
2876 2876  
  2877 + $scope.transparencyDrawnRegions = [];
  2878 + $scope.canThirdBRDrawn = false;
  2879 +
  2880 +
2877 2881 $.each(BodyRegionDictionary, function (index, value) {
2878 2882 //debugger;
2879 2883 // alert(' $.each(BodyRegionDictionary1')
2880 2884  
  2885 + if (value.bodyRegionId == '3') {
  2886 +
  2887 + var BR_SixTBData = new jinqJs()
  2888 + .from($scope.transparencyDrawnRegions)
  2889 + .where('BRID == 6')
  2890 + .select();
  2891 +
  2892 + if (BR_SixTBData != null && BR_SixTBData != undefined && BR_SixTBData.length > 0) {
  2893 +
  2894 + $scope.canThirdBRDrawn = true;
  2895 +
  2896 + }
  2897 +
  2898 +
  2899 + }
  2900 +
2881 2901 var bodyRegionRight = parseInt(value.X) + parseInt(value.Width);
2882 2902 var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height);
2883 2903  
... ... @@ -2888,8 +2908,53 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2888 2908 // debugger;
2889 2909 $scope.layerNumber = parseInt(txtlayerNumber.value);
2890 2910  
  2911 + if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
  2912 +
  2913 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  2914 + }
  2915 +
  2916 + else {
  2917 +
  2918 + if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == false) {
2891 2919  
2892   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, TransparencyBoxStartX, transparencyBoxRight, TransparencyBoxStartY, transparencyBoxBottom, $scope, true, false);
  2920 + //1. draw 6th
  2921 + var BRSixData = new jinqJs()
  2922 + .from(BodyRegionDictionary)
  2923 + .where('bodyRegionId == 6')
  2924 + .select();
  2925 + var isMirror = BRSixData[0].IsMirror;
  2926 + if (isMirror == 'Yes') {
  2927 + //draw mirror arm
  2928 + $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);
  2929 + //draw non mirror arm
  2930 + $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);
  2931 + //draw 3rd BR
  2932 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
  2933 +
  2934 +
  2935 + }
  2936 + else {
  2937 + //draw mirror arm
  2938 + $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);
  2939 + //draw non mirror arm
  2940 + $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);
  2941 + //draw 3rd BR
  2942 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
  2943 +
  2944 + }
  2945 +
  2946 + }
  2947 + else {
  2948 + var BR_SixTBData = new jinqJs()
  2949 + .from($scope.transparencyDrawnRegions)
  2950 + .where('BRID == 6')
  2951 + .select();
  2952 + if (value.bodyRegionId == "6" && BR_SixTBData != undefined && BR_SixTBData != null && BR_SixTBData.length>0) { }
  2953 + else
  2954 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false);
  2955 + }
  2956 + }
  2957 +
2893 2958 }
2894 2959  
2895 2960  
... ... @@ -4117,6 +4182,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4117 4182  
4118 4183 $scope.IncludedBodyRegions = [];
4119 4184 $scope.transparencyDrawnRegions = [];
  4185 + $scope.canThirdBRDrawn = false;
4120 4186  
4121 4187 $.each(BodyRegionDictionary, function (index, value) {
4122 4188  
... ... @@ -4162,19 +4228,80 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4162 4228  
4163 4229 $scope.isTBDrawnOnBodyRegion = true;
4164 4230  
  4231 + if (value.bodyRegionId == '3') {
  4232 +
  4233 + var BR_SixTBData = new jinqJs()
  4234 + .from($scope.transparencyDrawnRegions)
  4235 + .where('BRID == 6')
  4236 + .select();
  4237 +
  4238 + if (BR_SixTBData != null && BR_SixTBData != undefined && BR_SixTBData.length > 0) {
  4239 +
  4240 + $scope.canThirdBRDrawn = true;
  4241 +
  4242 + }
  4243 +
  4244 +
  4245 + }
  4246 +
4165 4247 if (($rootScope.voId == "9" || $rootScope.voId == "11")) {
4166 4248 if (value.bodyRegionId == "6") {
4167 4249 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
4168 4250 }
4169 4251 else {
4170   -
  4252 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
4171 4253 }
4172 4254 }
4173 4255 else {
4174   - $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4256 + if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
  4257 +
  4258 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4259 + }
  4260 +
  4261 + else {
4175 4262  
4176   - }
4177   - }
  4263 + if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == false) {
  4264 +
  4265 + //1. draw 6th
  4266 + var BRSixData = new jinqJs()
  4267 + .from(BodyRegionDictionary)
  4268 + .where('bodyRegionId == 6')
  4269 + .select();
  4270 + var isMirror = BRSixData[0].IsMirror;
  4271 + if (isMirror == 'Yes') {
  4272 + //draw mirror arm
  4273 + $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);
  4274 + //draw non mirror arm
  4275 + $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);
  4276 + //draw 3rd BR
  4277 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4278 +
  4279 + }
  4280 + else {
  4281 + //draw mirror arm
  4282 + $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);
  4283 + //draw mirror arm
  4284 + $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);
  4285 + //draw mirror arm
  4286 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4287 +
  4288 + }
  4289 +
  4290 + }
  4291 + else {
  4292 + var BR_SixTBData = new jinqJs()
  4293 + .from($scope.transparencyDrawnRegions)
  4294 + .where('BRID == 6')
  4295 + .select();
  4296 + if (value.bodyRegionId == "6" && BR_SixTBData != undefined && BR_SixTBData != null && BR_SixTBData.length>0) { }
  4297 + else
  4298 + $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false);
  4299 + }
  4300 + }
  4301 +
  4302 + }
  4303 +
  4304 + }
4178 4305 })
4179 4306  
4180 4307 //for modesty
... ... @@ -4593,7 +4720,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4593 4720 }
4594 4721  
4595 4722 //set modesty image visiblility true/false as per layer
4596   -
  4723 + // if(bodyRegionId.match('modestyImg3'))
4597 4724  
4598 4725 var layerInfo = new jinqJs()
4599 4726 .from($scope.layerInfoForModesty)
... ... @@ -4625,6 +4752,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4625 4752  
4626 4753 }
4627 4754 }
  4755 +
4628 4756 }
4629 4757  
4630 4758 }
... ... @@ -4870,8 +4998,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4870 4998 // var ctx = transparencyCanvas.getContext('2d');
4871 4999 ctx.drawImage(tmpCanvasContext, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage)
4872 5000  
4873   - $scope.transparencyDrawnRegions.push(bodyRegionId);
4874   -
  5001 + // $scope.transparencyDrawnRegions.push(bodyRegionId);
  5002 + $scope.transparencyDrawnRegions.push({'BRID': bodyRegionId});
4875 5003  
4876 5004 $rootScope.isLoading = false;
4877 5005 $('#spinner').css('visibility', 'hidden');
... ... @@ -5178,6 +5306,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5178 5306  
5179 5307 $scope.IncludedBodyRegions = [];
5180 5308 $scope.transparencyDrawnRegions = [];
  5309 + $scope.canThirdBRDrawn = false;
5181 5310 // $scope.layerNo = parseInt(document.getElementById(''))
5182 5311 var counter = 0;
5183 5312 $.each(BodyRegionDictionary, function (index, value) {
... ... @@ -5197,7 +5326,71 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5197 5326 if ($scope.isTBDrawnOnBodyRegion == false) {
5198 5327 $scope.layerNumber = $scope.layerNumber + 1;
5199 5328 }
5200   - $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);
  5329 +
  5330 + if (value.bodyRegionId == '3') {
  5331 +
  5332 + var BR_SixTBData = new jinqJs()
  5333 + .from($scope.transparencyDrawnRegions)
  5334 + .where('BRID == 6')
  5335 + .select();
  5336 +
  5337 + if (BR_SixTBData != null && BR_SixTBData != undefined && BR_SixTBData.length > 0) {
  5338 +
  5339 + $scope.canThirdBRDrawn = true;
  5340 +
  5341 + }
  5342 +
  5343 +
  5344 + }
  5345 + //$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);
  5346 +
  5347 + if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
  5348 +
  5349 + $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);
  5350 + }
  5351 +
  5352 + else {
  5353 +
  5354 + if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == false) {
  5355 +
  5356 + //1. draw 6th
  5357 + var BRSixData = new jinqJs()
  5358 + .from(BodyRegionDictionary)
  5359 + .where('bodyRegionId == 6')
  5360 + .select();
  5361 + var isMirror = BRSixData[0].IsMirror;
  5362 + if (isMirror == 'Yes') {
  5363 + //draw mirror arm
  5364 + $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);
  5365 + //draw non mirror arm
  5366 + $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);
  5367 + //draw 3rd BR
  5368 + $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);
  5369 +
  5370 + }
  5371 + else {
  5372 + //draw mirror arm
  5373 + $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);
  5374 + //draw non mirror arm
  5375 + $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);
  5376 + //draw 3rd BR
  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 + }
  5379 +
  5380 +
  5381 + }
  5382 + else {
  5383 + var BR_SixTBData = new jinqJs()
  5384 + .from($scope.transparencyDrawnRegions)
  5385 + .where('BRID == 6')
  5386 + .select();
  5387 + if (value.bodyRegionId == "6" && BR_SixTBData != undefined && BR_SixTBData != null && BR_SixTBData.length > 0) {
  5388 + //do not draw 6 BR again, its already drawn
  5389 + }
  5390 + else
  5391 + $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);
  5392 + }
  5393 + }
5201 5394 $scope.isTBDrawnOnBodyRegion = true;
5202 5395 }
5203 5396  
... ... @@ -5208,8 +5401,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5208 5401 //for modesty
5209 5402 if ($rootScope.isModestyOn == true && $scope.modestyImageInfo.length > 0) {
5210 5403 $.each($scope.modestyImageInfo, function (index, value) {
5211   - // alert(' $.each(BodyRegionDictionary1')
5212   -
5213 5404  
5214 5405 var bodyRegionRight = parseInt(value.x) + parseInt(value.Width);
5215 5406 var bodyRegionBottom = parseInt(value.y) + parseInt(value.Height);
... ... @@ -5230,9 +5421,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5230 5421 })
5231 5422 }
5232 5423  
5233   - // });
5234   - //$(".ui-wrapper").css("z-index", "600");
5235   - $scope.isResized = false;
  5424 + $scope.isResized = false;
5236 5425 }
5237 5426  
5238 5427  
... ...