Commit 72d5119464e378010f970548bb6aae613d2a9f37

Authored by Amrita Vishnoi
1 parent f5686914

Female and Male Medial Arm is integrated.

400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
@@ -321,158 +321,6 @@ @@ -321,158 +321,6 @@
321 <Content Include="content\images\DA\BodyViews\11\skintone\W\da_tni_3345_WN.jpg" /> 321 <Content Include="content\images\DA\BodyViews\11\skintone\W\da_tni_3345_WN.jpg" />
322 <Content Include="content\images\DA\BodyViews\11\skintone\W\da_tni_3345_WY.jpg" /> 322 <Content Include="content\images\DA\BodyViews\11\skintone\W\da_tni_3345_WY.jpg" />
323 <Content Include="content\images\DA\BodyViews\12\da_tni_3346.jpg" /> 323 <Content Include="content\images\DA\BodyViews\12\da_tni_3346.jpg" />
324 - <Content Include="content\images\DA\BodyViews\12\layers\0\6\A\533.jpg" />  
325 - <Content Include="content\images\DA\BodyViews\12\layers\0\6\A\533_mci.png" />  
326 - <Content Include="content\images\DA\BodyViews\12\layers\0\6\B\536.jpg" />  
327 - <Content Include="content\images\DA\BodyViews\12\layers\0\6\B\536_mci.png" />  
328 - <Content Include="content\images\DA\BodyViews\12\layers\0\6\L\538.jpg" />  
329 - <Content Include="content\images\DA\BodyViews\12\layers\0\6\L\538_mci.png" />  
330 - <Content Include="content\images\DA\BodyViews\12\layers\0\6\W\539.jpg" />  
331 - <Content Include="content\images\DA\BodyViews\12\layers\0\6\W\539_mci.png" />  
332 - <Content Include="content\images\DA\BodyViews\12\layers\10\6\549.jpg" />  
333 - <Content Include="content\images\DA\BodyViews\12\layers\10\6\549_mci.png" />  
334 - <Content Include="content\images\DA\BodyViews\12\layers\11\6\550.jpg" />  
335 - <Content Include="content\images\DA\BodyViews\12\layers\11\6\550_mci.png" />  
336 - <Content Include="content\images\DA\BodyViews\12\layers\12\6\551.jpg" />  
337 - <Content Include="content\images\DA\BodyViews\12\layers\12\6\551_mci.png" />  
338 - <Content Include="content\images\DA\BodyViews\12\layers\13\6\552.jpg" />  
339 - <Content Include="content\images\DA\BodyViews\12\layers\13\6\552_mci.png" />  
340 - <Content Include="content\images\DA\BodyViews\12\layers\14\6\553.jpg" />  
341 - <Content Include="content\images\DA\BodyViews\12\layers\14\6\553_mci.png" />  
342 - <Content Include="content\images\DA\BodyViews\12\layers\15\6\554.jpg" />  
343 - <Content Include="content\images\DA\BodyViews\12\layers\15\6\554_mci.png" />  
344 - <Content Include="content\images\DA\BodyViews\12\layers\16\6\555.jpg" />  
345 - <Content Include="content\images\DA\BodyViews\12\layers\16\6\555_mci.png" />  
346 - <Content Include="content\images\DA\BodyViews\12\layers\17\6\556.jpg" />  
347 - <Content Include="content\images\DA\BodyViews\12\layers\17\6\556_mci.png" />  
348 - <Content Include="content\images\DA\BodyViews\12\layers\18\6\557.jpg" />  
349 - <Content Include="content\images\DA\BodyViews\12\layers\18\6\557_mci.png" />  
350 - <Content Include="content\images\DA\BodyViews\12\layers\19\6\558.jpg" />  
351 - <Content Include="content\images\DA\BodyViews\12\layers\19\6\558_mci.png" />  
352 - <Content Include="content\images\DA\BodyViews\12\layers\1\6\540.jpg" />  
353 - <Content Include="content\images\DA\BodyViews\12\layers\1\6\540_mci.png" />  
354 - <Content Include="content\images\DA\BodyViews\12\layers\20\6\559.jpg" />  
355 - <Content Include="content\images\DA\BodyViews\12\layers\20\6\559_mci.png" />  
356 - <Content Include="content\images\DA\BodyViews\12\layers\21\6\560.jpg" />  
357 - <Content Include="content\images\DA\BodyViews\12\layers\21\6\560_mci.png" />  
358 - <Content Include="content\images\DA\BodyViews\12\layers\22\6\561.jpg" />  
359 - <Content Include="content\images\DA\BodyViews\12\layers\22\6\561_mci.png" />  
360 - <Content Include="content\images\DA\BodyViews\12\layers\23\6\562.jpg" />  
361 - <Content Include="content\images\DA\BodyViews\12\layers\23\6\562_mci.png" />  
362 - <Content Include="content\images\DA\BodyViews\12\layers\24\6\563.jpg" />  
363 - <Content Include="content\images\DA\BodyViews\12\layers\24\6\563_mci.png" />  
364 - <Content Include="content\images\DA\BodyViews\12\layers\25\6\564.jpg" />  
365 - <Content Include="content\images\DA\BodyViews\12\layers\25\6\564_mci.png" />  
366 - <Content Include="content\images\DA\BodyViews\12\layers\26\6\565.jpg" />  
367 - <Content Include="content\images\DA\BodyViews\12\layers\26\6\565_mci.png" />  
368 - <Content Include="content\images\DA\BodyViews\12\layers\27\6\566.jpg" />  
369 - <Content Include="content\images\DA\BodyViews\12\layers\27\6\566_mci.png" />  
370 - <Content Include="content\images\DA\BodyViews\12\layers\28\6\567.jpg" />  
371 - <Content Include="content\images\DA\BodyViews\12\layers\28\6\567_mci.png" />  
372 - <Content Include="content\images\DA\BodyViews\12\layers\29\6\568.jpg" />  
373 - <Content Include="content\images\DA\BodyViews\12\layers\29\6\568_mci.png" />  
374 - <Content Include="content\images\DA\BodyViews\12\layers\2\6\541.jpg" />  
375 - <Content Include="content\images\DA\BodyViews\12\layers\2\6\541_mci.png" />  
376 - <Content Include="content\images\DA\BodyViews\12\layers\30\6\569.jpg" />  
377 - <Content Include="content\images\DA\BodyViews\12\layers\30\6\569_mci.png" />  
378 - <Content Include="content\images\DA\BodyViews\12\layers\31\6\570.jpg" />  
379 - <Content Include="content\images\DA\BodyViews\12\layers\31\6\570_mci.png" />  
380 - <Content Include="content\images\DA\BodyViews\12\layers\32\6\571.jpg" />  
381 - <Content Include="content\images\DA\BodyViews\12\layers\32\6\571_mci.png" />  
382 - <Content Include="content\images\DA\BodyViews\12\layers\33\6\572.jpg" />  
383 - <Content Include="content\images\DA\BodyViews\12\layers\33\6\572_mci.png" />  
384 - <Content Include="content\images\DA\BodyViews\12\layers\34\6\573.jpg" />  
385 - <Content Include="content\images\DA\BodyViews\12\layers\34\6\573_mci.png" />  
386 - <Content Include="content\images\DA\BodyViews\12\layers\35\6\574.jpg" />  
387 - <Content Include="content\images\DA\BodyViews\12\layers\35\6\574_mci.png" />  
388 - <Content Include="content\images\DA\BodyViews\12\layers\36\6\575.jpg" />  
389 - <Content Include="content\images\DA\BodyViews\12\layers\36\6\575_mci.png" />  
390 - <Content Include="content\images\DA\BodyViews\12\layers\37\6\576.jpg" />  
391 - <Content Include="content\images\DA\BodyViews\12\layers\37\6\576_mci.png" />  
392 - <Content Include="content\images\DA\BodyViews\12\layers\38\6\577.jpg" />  
393 - <Content Include="content\images\DA\BodyViews\12\layers\38\6\577_mci.png" />  
394 - <Content Include="content\images\DA\BodyViews\12\layers\39\6\578.jpg" />  
395 - <Content Include="content\images\DA\BodyViews\12\layers\39\6\578_mci.png" />  
396 - <Content Include="content\images\DA\BodyViews\12\layers\3\6\542.jpg" />  
397 - <Content Include="content\images\DA\BodyViews\12\layers\3\6\542_mci.png" />  
398 - <Content Include="content\images\DA\BodyViews\12\layers\40\6\579.jpg" />  
399 - <Content Include="content\images\DA\BodyViews\12\layers\40\6\579_mci.png" />  
400 - <Content Include="content\images\DA\BodyViews\12\layers\41\6\580.jpg" />  
401 - <Content Include="content\images\DA\BodyViews\12\layers\41\6\580_mci.png" />  
402 - <Content Include="content\images\DA\BodyViews\12\layers\42\6\581.jpg" />  
403 - <Content Include="content\images\DA\BodyViews\12\layers\42\6\581_mci.png" />  
404 - <Content Include="content\images\DA\BodyViews\12\layers\43\6\582.jpg" />  
405 - <Content Include="content\images\DA\BodyViews\12\layers\43\6\582_mci.png" />  
406 - <Content Include="content\images\DA\BodyViews\12\layers\44\6\583.jpg" />  
407 - <Content Include="content\images\DA\BodyViews\12\layers\44\6\583_mci.png" />  
408 - <Content Include="content\images\DA\BodyViews\12\layers\45\6\584.jpg" />  
409 - <Content Include="content\images\DA\BodyViews\12\layers\45\6\584_mci.png" />  
410 - <Content Include="content\images\DA\BodyViews\12\layers\46\6\585.jpg" />  
411 - <Content Include="content\images\DA\BodyViews\12\layers\46\6\585_mci.png" />  
412 - <Content Include="content\images\DA\BodyViews\12\layers\47\6\586.jpg" />  
413 - <Content Include="content\images\DA\BodyViews\12\layers\47\6\586_mci.png" />  
414 - <Content Include="content\images\DA\BodyViews\12\layers\48\6\587.jpg" />  
415 - <Content Include="content\images\DA\BodyViews\12\layers\48\6\587_mci.png" />  
416 - <Content Include="content\images\DA\BodyViews\12\layers\49\6\588.jpg" />  
417 - <Content Include="content\images\DA\BodyViews\12\layers\49\6\588_mci.png" />  
418 - <Content Include="content\images\DA\BodyViews\12\layers\4\6\543.jpg" />  
419 - <Content Include="content\images\DA\BodyViews\12\layers\4\6\543_mci.png" />  
420 - <Content Include="content\images\DA\BodyViews\12\layers\50\6\589.jpg" />  
421 - <Content Include="content\images\DA\BodyViews\12\layers\50\6\589_mci.png" />  
422 - <Content Include="content\images\DA\BodyViews\12\layers\51\6\590.jpg" />  
423 - <Content Include="content\images\DA\BodyViews\12\layers\51\6\590_mci.png" />  
424 - <Content Include="content\images\DA\BodyViews\12\layers\52\6\591.jpg" />  
425 - <Content Include="content\images\DA\BodyViews\12\layers\52\6\591_mci.png" />  
426 - <Content Include="content\images\DA\BodyViews\12\layers\53\6\592.jpg" />  
427 - <Content Include="content\images\DA\BodyViews\12\layers\53\6\592_mci.png" />  
428 - <Content Include="content\images\DA\BodyViews\12\layers\54\6\593.jpg" />  
429 - <Content Include="content\images\DA\BodyViews\12\layers\54\6\593_mci.png" />  
430 - <Content Include="content\images\DA\BodyViews\12\layers\55\6\594.jpg" />  
431 - <Content Include="content\images\DA\BodyViews\12\layers\55\6\594_mci.png" />  
432 - <Content Include="content\images\DA\BodyViews\12\layers\56\6\595.jpg" />  
433 - <Content Include="content\images\DA\BodyViews\12\layers\56\6\595_mci.png" />  
434 - <Content Include="content\images\DA\BodyViews\12\layers\57\6\596.jpg" />  
435 - <Content Include="content\images\DA\BodyViews\12\layers\57\6\596_mci.png" />  
436 - <Content Include="content\images\DA\BodyViews\12\layers\58\6\597.jpg" />  
437 - <Content Include="content\images\DA\BodyViews\12\layers\58\6\597_mci.png" />  
438 - <Content Include="content\images\DA\BodyViews\12\layers\59\6\598.jpg" />  
439 - <Content Include="content\images\DA\BodyViews\12\layers\59\6\598_mci.png" />  
440 - <Content Include="content\images\DA\BodyViews\12\layers\5\6\544.jpg" />  
441 - <Content Include="content\images\DA\BodyViews\12\layers\5\6\544_mci.png" />  
442 - <Content Include="content\images\DA\BodyViews\12\layers\60\6\599.jpg" />  
443 - <Content Include="content\images\DA\BodyViews\12\layers\60\6\599_mci.png" />  
444 - <Content Include="content\images\DA\BodyViews\12\layers\61\6\600.jpg" />  
445 - <Content Include="content\images\DA\BodyViews\12\layers\61\6\600_mci.png" />  
446 - <Content Include="content\images\DA\BodyViews\12\layers\62\6\601.jpg" />  
447 - <Content Include="content\images\DA\BodyViews\12\layers\62\6\601_mci.png" />  
448 - <Content Include="content\images\DA\BodyViews\12\layers\63\6\602.jpg" />  
449 - <Content Include="content\images\DA\BodyViews\12\layers\63\6\602_mci.png" />  
450 - <Content Include="content\images\DA\BodyViews\12\layers\64\6\603.jpg" />  
451 - <Content Include="content\images\DA\BodyViews\12\layers\64\6\603_mci.png" />  
452 - <Content Include="content\images\DA\BodyViews\12\layers\65\6\604.jpg" />  
453 - <Content Include="content\images\DA\BodyViews\12\layers\65\6\604_mci.png" />  
454 - <Content Include="content\images\DA\BodyViews\12\layers\66\6\605.jpg" />  
455 - <Content Include="content\images\DA\BodyViews\12\layers\66\6\605_mci.png" />  
456 - <Content Include="content\images\DA\BodyViews\12\layers\67\6\606.jpg" />  
457 - <Content Include="content\images\DA\BodyViews\12\layers\67\6\606_mci.png" />  
458 - <Content Include="content\images\DA\BodyViews\12\layers\68\6\607.jpg" />  
459 - <Content Include="content\images\DA\BodyViews\12\layers\68\6\607_mci.png" />  
460 - <Content Include="content\images\DA\BodyViews\12\layers\69\6\608.jpg" />  
461 - <Content Include="content\images\DA\BodyViews\12\layers\69\6\608_mci.png" />  
462 - <Content Include="content\images\DA\BodyViews\12\layers\6\6\545.jpg" />  
463 - <Content Include="content\images\DA\BodyViews\12\layers\6\6\545_mci.png" />  
464 - <Content Include="content\images\DA\BodyViews\12\layers\70\6\609.jpg" />  
465 - <Content Include="content\images\DA\BodyViews\12\layers\70\6\609_mci.png" />  
466 - <Content Include="content\images\DA\BodyViews\12\layers\71\6\610.jpg" />  
467 - <Content Include="content\images\DA\BodyViews\12\layers\71\6\610_mci.png" />  
468 - <Content Include="content\images\DA\BodyViews\12\layers\72\6\611.jpg" />  
469 - <Content Include="content\images\DA\BodyViews\12\layers\72\6\611_mci.png" />  
470 - <Content Include="content\images\DA\BodyViews\12\layers\7\6\546.jpg" />  
471 - <Content Include="content\images\DA\BodyViews\12\layers\7\6\546_mci.png" />  
472 - <Content Include="content\images\DA\BodyViews\12\layers\8\6\547.jpg" />  
473 - <Content Include="content\images\DA\BodyViews\12\layers\8\6\547_mci.png" />  
474 - <Content Include="content\images\DA\BodyViews\12\layers\9\6\548.jpg" />  
475 - <Content Include="content\images\DA\BodyViews\12\layers\9\6\548_mci.png" />  
476 <Content Include="content\images\DA\BodyViews\12\skintone\A\da_tni_3346_A.jpg" /> 324 <Content Include="content\images\DA\BodyViews\12\skintone\A\da_tni_3346_A.jpg" />
477 <Content Include="content\images\DA\BodyViews\12\skintone\B\da_tni_3346_B.jpg" /> 325 <Content Include="content\images\DA\BodyViews\12\skintone\B\da_tni_3346_B.jpg" />
478 <Content Include="content\images\DA\BodyViews\12\skintone\L\da_tni_3346_L.jpg" /> 326 <Content Include="content\images\DA\BodyViews\12\skintone\L\da_tni_3346_L.jpg" />
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -183,11 +183,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -183,11 +183,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
183 // alert('da_dat_brview= ' + result) 183 // alert('da_dat_brview= ' + result)
184 184
185 var currentBodyViewId = localStorage.getItem("currentBodyViewId"); 185 var currentBodyViewId = localStorage.getItem("currentBodyViewId");
186 - 186 + var layerJsonPath = '';
  187 + var CommonViewId = 0;
187 //get layer data for body view 188 //get layer data for body view
188 -  
189 -  
190 - DataService.getAnotherJson('~/../content/data/json/da/bodyView/'+currentBodyViewId+'/da_dat_layer_'+currentBodyViewId+'.json') 189 + if (currentBodyViewId == 12) {
  190 + CommonViewId = 10;
  191 + layerJsonPath = '~/../content/data/json/da/bodyView/' + CommonViewId + '/da_dat_layer_' + CommonViewId + '.json';
  192 + }
  193 + else if (currentBodyViewId == 11)
  194 + {
  195 + CommonViewId = 9;
  196 + layerJsonPath = '~/../content/data/json/da/bodyView/' + CommonViewId + '/da_dat_layer_' + CommonViewId + '.json';
  197 + }
  198 + else
  199 + {
  200 + layerJsonPath = '~/../content/data/json/da/bodyView/' + currentBodyViewId + '/da_dat_layer_' + currentBodyViewId + '.json';
  201 + }
  202 +
  203 + DataService.getAnotherJson(layerJsonPath)
191 .then( 204 .then(
192 function (result) { 205 function (result) {
193 //debugger; 206 //debugger;
@@ -333,38 +346,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -333,38 +346,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
333 $scope.layerNumber = 0; 346 $scope.layerNumber = 0;
334 $scope.skinTone = DA[0].ethnicity; 347 $scope.skinTone = DA[0].ethnicity;
335 348
336 - var viewOrientationId = $scope.voId; 349 + $scope.viewOrientationId = $scope.voId;
337 if ($scope.voId == 5) 350 if ($scope.voId == 5)
338 { 351 {
339 - viewOrientationId = 1; 352 + $scope.viewOrientationId = 1;
340 } 353 }
341 else if ($scope.voId == 6) { 354 else if ($scope.voId == 6) {
342 - viewOrientationId = 2; 355 + $scope.viewOrientationId = 2;
343 } 356 }
344 else if ($scope.voId == 7) { 357 else if ($scope.voId == 7) {
345 - viewOrientationId = 3; 358 + $scope.viewOrientationId = 3;
346 } 359 }
347 else if ($scope.voId == 8) { 360 else if ($scope.voId == 8) {
348 - viewOrientationId = 4; 361 + $scope.viewOrientationId = 4;
349 } 362 }
350 else if ($scope.voId == 9) { 363 else if ($scope.voId == 9) {
351 - viewOrientationId = 5; 364 + $scope.viewOrientationId = 5;
352 } 365 }
353 else if ($scope.voId == 10) { 366 else if ($scope.voId == 10) {
354 - viewOrientationId =6; 367 + $scope.viewOrientationId = 6;
355 } 368 }
356 else if ($scope.voId == 11) { 369 else if ($scope.voId == 11) {
357 - viewOrientationId = 5; 370 + $scope.viewOrientationId = 5;
358 } 371 }
359 else if ($scope.voId == 12) { 372 else if ($scope.voId == 12) {
360 - viewOrientationId = 6; 373 + $scope.viewOrientationId = 6;
361 } 374 }
362 375
363 376
364 377
365 378
366 379
367 - $scope.CalculateImageCordinates(viewOrientationId); 380 + $scope.CalculateImageCordinates($scope.viewOrientationId);
368 }; 381 };
369 382
370 383
@@ -567,16 +580,43 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -567,16 +580,43 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
567 580
568 if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) { 581 if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) {
569 582
570 - return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName; 583 + if ($scope.voId == 12) {
  584 + return "content/images/DA/BodyViews/10/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  585 + }
  586 + else
  587 + {
  588 + return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  589 + }
571 } 590 }
572 } 591 }
573 } 592 }
574 593
575 else { 594 else {
576 - for (z = 0; z <= SelectedLayerData.BodyRegion.length; z++) {  
577 - var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;  
578 - if (bodyRegion == bodyRegionId) {  
579 - return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName; 595 + if ($scope.voId == 10 || $scope.voId == 12)
  596 + {
  597 + var bodyRegion = SelectedLayerData.BodyRegion._BodyRegionId;
  598 +
  599 + if ($scope.voId == 12) {
  600 + return "content/images/DA/BodyViews/10/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName;
  601 + }
  602 + else {
  603 + return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName;
  604 + }
  605 +
  606 +
  607 + }
  608 + else // it is for other body view which have multiple body regions and layer no > 0
  609 + {
  610 + for (var z = 0; z <= SelectedLayerData.BodyRegion.length; z++) {
  611 + var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
  612 + if (bodyRegion == bodyRegionId) {
  613 + if ($scope.voId == 12) {
  614 + return "content/images/DA/BodyViews/10/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  615 + }
  616 + else {
  617 + return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  618 + }
  619 + }
580 } 620 }
581 } 621 }
582 } 622 }
@@ -924,7 +964,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -924,7 +964,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
924 canDiv.innerHTML = ''; 964 canDiv.innerHTML = '';
925 } 965 }
926 966
927 - $scope.CalculateImageCordinates($scope.voId); 967 + $scope.CalculateImageCordinates ($scope.viewOrientationId );
928 968
929 969
930 $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition) 970 $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)