Female and Male Medial Arm is integrated.

Amrita Vishnoi
1 parent f5686914
Showing 2 changed files with 60 additions and 172 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -321,158 +321,6 @@
     <Content Include="content\images\DA\BodyViews\11\skintone\W\da_tni_3345_WN.jpg" />
     <Content Include="content\images\DA\BodyViews\11\skintone\W\da_tni_3345_WY.jpg" />
     <Content Include="content\images\DA\BodyViews\12\da_tni_3346.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\0\6\A\533.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\0\6\A\533_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\0\6\B\536.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\0\6\B\536_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\0\6\L\538.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\0\6\L\538_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\0\6\W\539.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\0\6\W\539_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\10\6\549.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\10\6\549_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\11\6\550.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\11\6\550_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\12\6\551.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\12\6\551_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\13\6\552.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\13\6\552_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\14\6\553.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\14\6\553_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\15\6\554.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\15\6\554_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\16\6\555.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\16\6\555_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\17\6\556.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\17\6\556_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\18\6\557.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\18\6\557_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\19\6\558.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\19\6\558_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\1\6\540.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\1\6\540_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\20\6\559.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\20\6\559_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\21\6\560.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\21\6\560_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\22\6\561.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\22\6\561_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\23\6\562.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\23\6\562_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\24\6\563.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\24\6\563_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\25\6\564.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\25\6\564_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\26\6\565.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\26\6\565_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\27\6\566.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\27\6\566_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\28\6\567.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\28\6\567_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\29\6\568.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\29\6\568_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\2\6\541.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\2\6\541_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\30\6\569.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\30\6\569_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\31\6\570.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\31\6\570_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\32\6\571.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\32\6\571_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\33\6\572.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\33\6\572_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\34\6\573.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\34\6\573_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\35\6\574.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\35\6\574_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\36\6\575.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\36\6\575_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\37\6\576.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\37\6\576_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\38\6\577.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\38\6\577_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\39\6\578.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\39\6\578_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\3\6\542.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\3\6\542_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\40\6\579.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\40\6\579_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\41\6\580.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\41\6\580_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\42\6\581.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\42\6\581_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\43\6\582.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\43\6\582_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\44\6\583.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\44\6\583_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\45\6\584.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\45\6\584_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\46\6\585.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\46\6\585_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\47\6\586.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\47\6\586_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\48\6\587.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\48\6\587_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\49\6\588.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\49\6\588_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\4\6\543.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\4\6\543_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\50\6\589.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\50\6\589_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\51\6\590.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\51\6\590_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\52\6\591.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\52\6\591_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\53\6\592.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\53\6\592_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\54\6\593.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\54\6\593_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\55\6\594.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\55\6\594_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\56\6\595.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\56\6\595_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\57\6\596.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\57\6\596_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\58\6\597.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\58\6\597_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\59\6\598.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\59\6\598_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\5\6\544.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\5\6\544_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\60\6\599.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\60\6\599_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\61\6\600.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\61\6\600_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\62\6\601.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\62\6\601_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\63\6\602.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\63\6\602_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\64\6\603.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\64\6\603_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\65\6\604.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\65\6\604_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\66\6\605.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\66\6\605_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\67\6\606.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\67\6\606_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\68\6\607.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\68\6\607_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\69\6\608.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\69\6\608_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\6\6\545.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\6\6\545_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\70\6\609.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\70\6\609_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\71\6\610.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\71\6\610_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\72\6\611.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\72\6\611_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\7\6\546.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\7\6\546_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\8\6\547.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\8\6\547_mci.png" />
-    <Content Include="content\images\DA\BodyViews\12\layers\9\6\548.jpg" />
-    <Content Include="content\images\DA\BodyViews\12\layers\9\6\548_mci.png" />
     <Content Include="content\images\DA\BodyViews\12\skintone\A\da_tni_3346_A.jpg" />
     <Content Include="content\images\DA\BodyViews\12\skintone\B\da_tni_3346_B.jpg" />
     <Content Include="content\images\DA\BodyViews\12\skintone\L\da_tni_3346_L.jpg" />
@@ -183,11 +183,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                //   alert('da_dat_brview= ' + result)
  
                var currentBodyViewId = localStorage.getItem("currentBodyViewId");
-
+               var layerJsonPath = '';
+               var CommonViewId = 0;
                //get layer data for body view
-
-
-               DataService.getAnotherJson('~/../content/data/json/da/bodyView/'+currentBodyViewId+'/da_dat_layer_'+currentBodyViewId+'.json')
+               if (currentBodyViewId == 12) {
+                    CommonViewId = 10;
+                   layerJsonPath = '~/../content/data/json/da/bodyView/' + CommonViewId + '/da_dat_layer_' + CommonViewId + '.json';
+               }
+               else if (currentBodyViewId == 11)
+               {
+                    CommonViewId = 9;
+                   layerJsonPath = '~/../content/data/json/da/bodyView/' + CommonViewId + '/da_dat_layer_' + CommonViewId + '.json';
+               }
+               else
+               {
+                   layerJsonPath = '~/../content/data/json/da/bodyView/' + currentBodyViewId + '/da_dat_layer_' + currentBodyViewId + '.json';
+               }
+
+               DataService.getAnotherJson(layerJsonPath)
               .then(
                function (result) {
                    //debugger;
@@ -333,38 +346,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.layerNumber = 0;
         $scope.skinTone = DA[0].ethnicity;
  
-        var viewOrientationId = $scope.voId;
+        $scope.viewOrientationId = $scope.voId;
         if ($scope.voId == 5)
         {
-            viewOrientationId = 1;
+            $scope.viewOrientationId = 1;
         }
         else if ($scope.voId == 6) {
-            viewOrientationId = 2;
+            $scope.viewOrientationId = 2;
         }
         else if ($scope.voId == 7) {
-            viewOrientationId = 3;
+            $scope.viewOrientationId = 3;
         }
         else if ($scope.voId == 8) {
-            viewOrientationId = 4;
+            $scope.viewOrientationId = 4;
         }
         else if ($scope.voId == 9) {
-            viewOrientationId = 5;
+            $scope.viewOrientationId = 5;
         }
         else if ($scope.voId == 10) {
-            viewOrientationId =6;
+            $scope.viewOrientationId = 6;
         }
         else if ($scope.voId == 11) {
-            viewOrientationId = 5;
+            $scope.viewOrientationId = 5;
         }
         else if ($scope.voId == 12) {
-            viewOrientationId = 6;
+            $scope.viewOrientationId = 6;
         }
  
  
  
  
  
-        $scope.CalculateImageCordinates(viewOrientationId);
+        $scope.CalculateImageCordinates($scope.viewOrientationId);
     };
  
  
@@ -567,16 +580,43 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
                 if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) {
  
-                    return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                    if ($scope.voId == 12) {
+                        return "content/images/DA/BodyViews/10/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                    }
+                    else
+                    {
+                        return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                    }
                 }
             }
         }
  
         else {
-            for (z = 0; z <= SelectedLayerData.BodyRegion.length; z++) {
-                var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
-                if (bodyRegion == bodyRegionId) {
-                    return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+            if ($scope.voId == 10 || $scope.voId == 12)
+            {
+                var bodyRegion = SelectedLayerData.BodyRegion._BodyRegionId;
+                
+                    if ($scope.voId == 12) {
+                        return "content/images/DA/BodyViews/10/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName;
+                    }
+                    else {
+                        return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName;
+                    }
+                
+
+            }
+            else // it is for other body view which have multiple body regions and layer no > 0
+            {
+                for (var z = 0; z <= SelectedLayerData.BodyRegion.length; z++) {
+                    var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
+                    if (bodyRegion == bodyRegionId) {
+                        if ($scope.voId == 12) {
+                            return "content/images/DA/BodyViews/10/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                        }
+                        else {
+                            return "content/images/DA/BodyViews/" + $scope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                        }
+                    }
                 }
             }
         }
@@ -924,7 +964,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             canDiv.innerHTML = '';
         }
  
-        $scope.CalculateImageCordinates($scope.voId);
+        $scope.CalculateImageCordinates ($scope.viewOrientationId );
  
  
         $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)