commit after DAHighLightFixes merge

Nikita Kulshreshtha
2 parents 47c50671 0729a1a7
Showing 14 changed files with 163 additions and 262 deletions
150-DOCUMENTATION/AIA-July-Report.pptx
150-DOCUMENTATION/AIA-June-Report.pptx
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
400-SOURCECODE/AIAHTML5.Web/body-view-wp.js
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/5/W/navigator_images/da_oi_37_WN.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/5/W/navigator_images/da_oi_38_WY.jpg
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/term-number-wp.js
@@ -39,9 +39,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Content Include="app\controllers\3dAController.js" />
-    <Content Include="app\controllers\abc.js" />
     <Content Include="app\controllers\ADAMImgController.js" />
-    <Content Include="app\controllers\DAControllerList.js" />
     <Content Include="app\controllers\LinkController.js" />
     <Content Include="app\controllers\AnatTestController.js" />
     <Content Include="app\controllers\AODController.js" />
@@ -77,146 +75,6 @@
     <Content Include="app\views\LabExerc\LabExerc-view.html" />
     <Content Include="app\widget\MainMenu.html" />
     <Content Include="body-view-wp.js" />
-    <Content Include="content\images\DA\ethnicity\body-views\10\A\navigator_images\da_oi_101.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\10\A\thumbnails\da_tni_3344_A.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\10\B\navigator_images\da_oi_103.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\10\B\thumbnails\da_tni_3344_B.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\10\L\navigator_images\da_oi_105.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\10\L\thumbnails\da_tni_3344_L.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\10\W\navigator_images\da_oi_107.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\10\W\thumbnails\da_tni_3344_W.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\A\navigator_images\da_oi_10.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\A\navigator_images\da_oi_11.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\A\thumbnails\da_tni_3345_AN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\A\thumbnails\da_tni_3345_AY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\B\navigator_images\da_oi_14.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\B\navigator_images\da_oi_15.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\B\thumbnails\da_tni_3345_BN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\B\thumbnails\da_tni_3345_BY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\L\navigator_images\da_oi_21.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\L\navigator_images\da_oi_22.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\L\thumbnails\da_tni_3345_LN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\L\thumbnails\da_tni_3345_LY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\W\navigator_images\da_oi_25.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\W\navigator_images\da_oi_26.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\W\thumbnails\da_tni_3345_WN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\11\W\thumbnails\da_tni_3345_WY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\12\A\navigator_images\da_oi_29.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\12\A\thumbnails\da_tni_3346_A.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\12\B\navigator_images\da_oi_31.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\12\B\thumbnails\da_tni_3346_B.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\12\L\navigator_images\da_oi_33.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\12\L\thumbnails\da_tni_3346_L.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\12\W\navigator_images\da_oi_35.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\12\W\thumbnails\da_tni_3346_W.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\A\navigator_images\da_oi_81.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\A\navigator_images\da_oi_82.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\A\thumbnails\da_tni_3335_AN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\A\thumbnails\da_tni_3335_AY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\B\navigator_images\da_oi_85.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\B\navigator_images\da_oi_86.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\B\thumbnails\da_tni_3335_BN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\B\thumbnails\da_tni_3335_BY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\L\navigator_images\da_oi_89.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\L\navigator_images\da_oi_94.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\L\thumbnails\da_tni_3335_LN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\L\thumbnails\da_tni_3335_LY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\W\navigator_images\da_oi_109.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\W\navigator_images\da_oi_110.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\W\thumbnails\da_tni_3335_WN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\1\W\thumbnails\da_tni_3335_WY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\2\A\navigator_images\da_oi_113.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\2\A\thumbnails\da_tni_3336_A.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\2\B\navigator_images\da_oi_115.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\2\B\thumbnails\da_tni_3336_B.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\2\L\navigator_images\da_oi_117.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\2\L\thumbnails\da_tni_3336_L.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\2\W\navigator_images\da_oi_119.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\2\W\thumbnails\da_tni_3336_W.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\A\navigator_images\da_oi_121.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\A\thumbnails\da_tni_3337_AN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\A\thumbnails\da_tni_3337_AY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\B\navigator_images\da_oi_123.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\B\thumbnails\da_tni_3337_BN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\B\thumbnails\da_tni_3337_BY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\L\navigator_images\da_oi_125.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\L\thumbnails\da_tni_3337_LN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\L\thumbnails\da_tni_3337_LY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\W\navigator_images\da_oi_127.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\W\thumbnails\da_tni_3337_WN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\3\W\thumbnails\da_tni_3337_WY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\4\A\navigator_images\da_oi_129.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\4\A\thumbnails\da_tni_3338_A.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\4\B\navigator_images\da_oi_131.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\4\B\thumbnails\da_tni_3338_B.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\4\L\navigator_images\da_oi_133.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\4\L\thumbnails\da_tni_3338_L.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\4\W\navigator_images\da_oi_135.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\4\W\thumbnails\da_tni_3338_W.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\A\navigator_images\da_oi_1.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\A\navigator_images\da_oi_2.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\A\thumbnails\da_tni_3339_AN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\A\thumbnails\da_tni_3339_AY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\B\navigator_images\da_oi_5.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\B\navigator_images\da_oi_6.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\B\thumbnails\da_tni_3339_BN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\B\thumbnails\da_tni_3339_BY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\L\navigator_images\da_oi_18.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\L\navigator_images\da_oi_9.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\L\thumbnails\da_tni_3339_LN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\L\thumbnails\da_tni_3339_LY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_37_WN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_38_WY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\W\thumbnails\da_tni_3339_WN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\W\thumbnails\da_tni_3339_WY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\A\navigator_images\da_oi_41.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\A\navigator_images\da_oi_42.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\A\thumbnails\da_tni_3340_AN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\A\thumbnails\da_tni_3340_AY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\B\navigator_images\da_oi_45.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\B\navigator_images\da_oi_46.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\B\thumbnails\da_tni_3340_BN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\B\thumbnails\da_tni_3340_BY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\L\navigator_images\da_oi_49.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\L\navigator_images\da_oi_50.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\L\thumbnails\da_tni_3340_LN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\L\thumbnails\da_tni_3340_LY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\W\navigator_images\da_oi_53.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\W\navigator_images\da_oi_54.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\W\thumbnails\da_tni_3340_WN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\6\W\thumbnails\da_tni_3340_WY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\A\navigator_images\da_oi_57.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\A\navigator_images\da_oi_58.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\A\thumbnails\da_tni_3341_AN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\A\thumbnails\da_tni_3341_AY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\B\navigator_images\da_oi_61.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\B\navigator_images\da_oi_62.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\B\thumbnails\da_tni_3341_BN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\B\thumbnails\da_tni_3341_BY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\L\navigator_images\da_oi_65.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\L\navigator_images\da_oi_66.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\L\thumbnails\da_tni_3341_LN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\L\thumbnails\da_tni_3341_LY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\W\navigator_images\da_oi_69.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\W\navigator_images\da_oi_70.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\W\thumbnails\da_tni_3341_WN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\7\W\thumbnails\da_tni_3341_WY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\8\A\navigator_images\da_oi_73.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\8\A\thumbnails\da_tni_3342_A.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\8\B\navigator_images\da_oi_75.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\8\B\thumbnails\da_tni_3342_B.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\8\L\navigator_images\da_oi_77.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\8\L\thumbnails\da_tni_3342_L.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\8\W\navigator_images\da_oi_79.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\8\W\thumbnails\da_tni_3342_w.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\9\A\navigator_images\da_oi_90.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\9\A\thumbnails\da_tni_3343_A.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\9\B\navigator_images\da_oi_92.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\9\B\thumbnails\da_tni_3343_B.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\9\L\navigator_images\da_oi_97.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\9\L\thumbnails\da_tni_3343_L.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\9\W\navigator_images\da_oi_99.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\9\W\thumbnails\da_tni_3343_W.jpg" />
     <Content Include="content\css\main.css" />
     <Content Include="content\data\json\da\body-views\1\da_dat_tm_sg_1.json" />
     <Content Include="content\data\json\da\body-views\10\da_dat_body_system_term_10.json" />
@@ -363,8 +221,8 @@
     <Content Include="content\images\DA\ethnicity\body-views\5\L\navigator_images\da_oi_9.jpg" />
     <Content Include="content\images\DA\ethnicity\body-views\5\L\thumbnails\da_tni_3339_LN.jpg" />
     <Content Include="content\images\DA\ethnicity\body-views\5\L\thumbnails\da_tni_3339_LY.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_37_WN.jpg" />
-    <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_38_WY.jpg" />
+    <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_37.jpg" />
+    <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_38.jpg" />
     <Content Include="content\images\DA\ethnicity\body-views\5\W\thumbnails\da_tni_3339_WN.jpg" />
     <Content Include="content\images\DA\ethnicity\body-views\5\W\thumbnails\da_tni_3339_WY.jpg" />
     <Content Include="content\images\DA\ethnicity\body-views\6\A\navigator_images\da_oi_41.jpg" />
@@ -686,7 +686,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     //1.Get image source
                     var src = $scope.GetImageSource(value._BodyRegionId);
-                  
+
                     $scope.imageSource = src;
                     //   debugger;
@@ -993,45 +993,45 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var SelectedLayerData = [];
         SelectedLayerData = $rootScope.BodyLayerData.Layers.DataLayer[dataLength - $scope.userInput - 1];
-        if((SelectedLayerData!=null || SelectedLayerData!=undefined) && SelectedLayerData.BodyRegion.length>0){
-        if ($scope.layerNumber == 0) {
-            for (var z = 0; z < SelectedLayerData.BodyRegion.length; z++) {
+        if ((SelectedLayerData != null || SelectedLayerData != undefined) && SelectedLayerData.BodyRegion.length > 0) {
+            if ($scope.layerNumber == 0) {
+                for (var z = 0; z < SelectedLayerData.BodyRegion.length; z++) {
-                var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
-                var bodyRegionSkinTone = SelectedLayerData.BodyRegion[z].Image._SkintTone;
+                    var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
+                    var bodyRegionSkinTone = SelectedLayerData.BodyRegion[z].Image._SkintTone;
-                if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) {
+                    if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) {
-                    return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                        return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                    }
                 }
             }
-        }
-        else {
-            //  debugger;
-            //below 4 bodyviews have only single body region
-            if ($rootScope.voId == 9 || $rootScope.voId == 11 || $rootScope.voId == 10 || $rootScope.voId == 12) {
-                var bodyRegion = SelectedLayerData.BodyRegion._BodyRegionId;
+            else {
+                //  debugger;
+                //below 4 bodyviews have only single body region
+                if ($rootScope.voId == 9 || $rootScope.voId == 11 || $rootScope.voId == 10 || $rootScope.voId == 12) {
+                    var bodyRegion = SelectedLayerData.BodyRegion._BodyRegionId;
-                return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName;
+                    return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.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
-            {
-                // debugger;
-                for (var z = 0; z <= SelectedLayerData.BodyRegion.length; z++) {
-                    var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
-                    if (bodyRegion == bodyRegionId) {
+                }
+                else // it is for other body view which have multiple body regions and layer no > 0
+                {
+                    // debugger;
+                    for (var z = 0; z <= SelectedLayerData.BodyRegion.length; z++) {
+                        var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
+                        if (bodyRegion == bodyRegionId) {
-                        return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                            return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
+                        }
                     }
                 }
             }
         }
     }
-    }
     $scope.GetBackgroundImgSource = function (bodyRegionId) {
         // debugger;
@@ -4326,36 +4326,74 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.flushCanvas = function () {
-        if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) {
-            angular.forEach($scope.ColoredImageSRC, function (value, key) {
+        //if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) {
+        //    angular.forEach($scope.ColoredImageSRC, function (value, key) {
+
+        //        var id;
+        //        var maskId;
+        //        if (value.haveMirror == 'true') {
+        //            id = 'imageCanvas' + value.bodyRegionId + '_MR';
+        //            maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci'
+        //        }
+        //        else {
+        //            id = 'imageCanvas' + value.bodyRegionId;
+        //            maskId = 'imageCanvas' + value.bodyRegionId + '_mci';
+        //        }
+
+        //        var canvas = document.getElementById(id);
+        //        if (canvas != null || canvas != undefined) {
+        //            document.getElementById('canvasDiv').removeChild(canvas);
+        //        }
+
+        //        var maskcanvas = document.getElementById(maskId);
+        //        if (maskcanvas != null || maskcanvas != undefined) {
+        //            document.getElementById('canvasDiv').removeChild(maskcanvas);
+
+        //        }
+
+        //        var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
+        //        for (var i = 0; i < modestyCanvases.length; i++) {
+        //            modestyCanvases[i].remove();
+        //        }
+        //    });
+        //}
-                var id;
-                var maskId;
-                if (value.haveMirror == 'true') {
-                    id = 'imageCanvas' + value.bodyRegionId + '_MR';
-                    maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci'
-                }
-                else {
-                    id = 'imageCanvas' + value.bodyRegionId;
-                    maskId = 'imageCanvas' + value.bodyRegionId + '_mci';
-                }
+        for (var i = 1; i < 7; i++) {
+
+            var id;
+            var maskId;
+
+            id = 'imageCanvas' + i;
+            maskId = 'imageCanvas' + i + '_mci';
+
+            var canvas = document.getElementById(id);
+            if (canvas != null || canvas!=undefined)
+              document.getElementById('canvasDiv').removeChild(canvas);
+
+            var maskcanvas = document.getElementById(maskId);
+            if (maskcanvas != null || maskcanvas != undefined)
+              document.getElementById('canvasDiv').removeChild(maskcanvas);
+
+            if (i == 4 || i == 5 || i == 6) {
+                id = 'imageCanvas' + i + '_MR';
+                maskId = 'imageCanvas' + i + '_MR_mci';
                 var canvas = document.getElementById(id);
-                if (canvas != null || canvas != undefined) {
-                    document.getElementById('canvasDiv').removeChild(canvas);
-                }
+                if (canvas != null || canvas != undefined)
+                  document.getElementById('canvasDiv').removeChild(canvas);
                 var maskcanvas = document.getElementById(maskId);
-                if (maskcanvas != null || maskcanvas != undefined) {
-                    document.getElementById('canvasDiv').removeChild(maskcanvas);
-
-                }
+                if (maskcanvas != null || maskcanvas != undefined)
+                  document.getElementById('canvasDiv').removeChild(maskcanvas);
+            }
-                var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
-                for (var i = 0; i < modestyCanvases.length; i++) {
-                    modestyCanvases[i].remove();
+            //remove modesty canavs
+            var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
+            if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) {
+                for (var j = 0; j < modestyCanvases.length; j++) {
+                    modestyCanvases[j].remove();
                 }
-            });
+            }
         }
     }
@@ -5564,37 +5602,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $('#layerChangeSlider').slider("option", "value", parseInt($scope.totalLayers) - parseInt($scope.layerNumber));
         //8.remove current layer canavses
-        for (var i = 1; i < 7; i++) {
+        $scope.flushCanvas();
+        //for (var i = 1; i < 7; i++) {
-            var id;
-            var maskId;
+        //    var id;
+        //    var maskId;
-            id = 'imageCanvas' + i;
-            maskId = 'imageCanvas' + i + '_mci';
+        //    id = 'imageCanvas' + i;
+        //    maskId = 'imageCanvas' + i + '_mci';
-            var canvas = document.getElementById(id);
-            document.getElementById('canvasDiv').removeChild(canvas);
+        //    var canvas = document.getElementById(id);
+        //    document.getElementById('canvasDiv').removeChild(canvas);
-            var maskcanvas = document.getElementById(maskId);
-            document.getElementById('canvasDiv').removeChild(maskcanvas);
+        //    var maskcanvas = document.getElementById(maskId);
+        //    document.getElementById('canvasDiv').removeChild(maskcanvas);
-            if (i == 4 || i == 5 || i == 6) {
-                id = 'imageCanvas' + i + '_MR';
-                maskId = 'imageCanvas' + i + '_MR_mci';
+        //    if (i == 4 || i == 5 || i == 6) {
+        //        id = 'imageCanvas' + i + '_MR';
+        //        maskId = 'imageCanvas' + i + '_MR_mci';
-                var canvas = document.getElementById(id);
-                document.getElementById('canvasDiv').removeChild(canvas);
+        //        var canvas = document.getElementById(id);
+        //        document.getElementById('canvasDiv').removeChild(canvas);
-                var maskcanvas = document.getElementById(maskId);
-                document.getElementById('canvasDiv').removeChild(maskcanvas);
-            }
+        //        var maskcanvas = document.getElementById(maskId);
+        //        document.getElementById('canvasDiv').removeChild(maskcanvas);
+        //    }
-            //remove modesty canavs
-            var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
-            for (var j = 0; j < modestyCanvases.length; j++) {
-                modestyCanvases[j].remove();
-            }
-        }
+        //    //remove modesty canavs
+        //    var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
+        //    for (var j = 0; j < modestyCanvases.length; j++) {
+        //        modestyCanvases[j].remove();
+        //    }
+        //}
         //9.
         $timeout(function () {
@@ -49,7 +49,6 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         //called on jsanel minimize
         $rootScope.setState = function (state, title) {
-            debugger;
             var alreadyOpenThisView = new jinqJs()
@@ -60,7 +59,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             if (alreadyOpenThisView != null) {
                 for (var i = 0; i < $rootScope.openViews.length; i++) {
                     k++;
-                    if ($rootScope.openViews[i].body - views == title) {
+                    if ($rootScope.openViews[i].body-views == title) {
                         $rootScope.openViews.splice((k - 1), 1);
                         $rootScope.openViews.push(
@@ -98,8 +97,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         //annotation tool custom events
         $rootScope.ShowAnnotationWindow = function () {
            $rootScope.isAnnotationWindowOpen = true;
-           $(".annotationTollbar").css("display", "block");
-           $rootScope.$broadcast('annotationToolEvent',true);
+          // $(".annotationTollbar").css("display", "block");
+          // $rootScope.$broadcast('annotationToolEvent',true);
         }
@@ -123,22 +123,22 @@
             </div>
             <div class="col-sm-6 dropdown hover-tool">
                 <div class="custom-tooltip">Highlight Options</div>
-                <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()"><img src="content/images/icon-highlight.png" alt="" title=""></button>
+                <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"  ng-click="LoadBodySystemData()" ><img src="content/images/icon-highlight.png" alt="" title=""></button>
                 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
                     <li><a href="#" title="Current Structure">Current Structure</a></li>
                     <li role="separator" class="divider"></li>
                     <li><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodysystem($event)">Cardiovascular</a></li>
-                    <li><a href="#" title="Digestive" id="2" ng-click="HighlightBodysystem($event)">Digestive</a></li>
-                    <li><a href="#" title="Endocrine" id="3" ng-click="HighlightBodysystem($event)">Endocrine</a></li>
-                    <li><a href="#" title="Immune" id="4" ng-click="HighlightBodysystem($event)">Immune</a></li>
-                    <li><a href="#" title="Integumentary" id="5" ng-click="HighlightBodysystem($event)">Integumentary</a></li>
-                    <li><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodysystem($event)">Lymphatic</a></li>
-                    <li><a href="#" title="Muscular" id="7" ng-click="HighlightBodysystem($event)">Muscular</a></li>
-                    <li><a href="#" title="Nervous" id="8" ng-click="HighlightBodysystem($event)">Nervous</a></li>
-                    <li><a href="#" title="Reproductive" id="9" ng-click="HighlightBodysystem($event)">Reproductive</a></li>
-                    <li><a href="#" title="Respiratory" id="10" ng-click="HighlightBodysystem($event)">Respiratory</a></li>
-                    <li><a href="#" title="Skeletal" id="11" ng-click="HighlightBodysystem($event)">Skeletal</a></li>
-                    <li><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)">Urinary</a></li>
+                    <li><a href="#" title="Digestive" id="2" ng-click="HighlightBodysystem($event)"  >Digestive</a></li>
+                    <li><a href="#" title="Endocrine" id="3" ng-click="HighlightBodysystem($event)"  >Endocrine</a></li>
+                    <li><a href="#" title="Immune" id="4" ng-click="HighlightBodysystem($event)"  >Immune</a></li>
+                    <li><a href="#" title="Integumentary" id="5" ng-click="HighlightBodysystem($event)"  >Integumentary</a></li>
+                    <li><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodysystem($event)"  >Lymphatic</a></li>
+                    <li><a href="#" title="Muscular" id="7" ng-click="HighlightBodysystem($event)"  >Muscular</a></li>
+                    <li><a href="#" title="Nervous" id="8" ng-click="HighlightBodysystem($event)"  >Nervous</a></li>
+                    <li><a href="#" title="Reproductive" id="9" ng-click="HighlightBodysystem($event)"  >Reproductive</a></li>
+                    <li><a href="#" title="Respiratory" id="10" ng-click="HighlightBodysystem($event)"  >Respiratory</a></li>
+                    <li><a href="#" title="Skeletal" id="11" ng-click="HighlightBodysystem($event)"  >Skeletal</a></li>
+                    <li><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)"  >Urinary</a></li>
                 </ul>
             </div>
             <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()">
@@ -167,7 +167,7 @@
         </div>
         <div class="">
             <p>
-                <input type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-change="LayerChange()">
+                <input type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-change="LayerChange()" />
             </p>
             <div id="layerChangeSlider" style="height:140px;" class="vert_slider " ng-model="layerNumber"></div>
         </div>
@@ -179,8 +179,8 @@
                 <div class="">
                     <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
-                        <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-init="HideSearch()" ng-focus="ShowSearch()" ng-blur="HideSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
-
+                        <input type="text" class="form-control input-sm pull-left" id="typedtermname"  ng-blur="HideSearch()" ng-click="ShowSearch()" ng-dblclick="ShowSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
+                        
                         <div id="backdrop" ng-show="IsSearchVisible">
                             <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
                                 <ul id="termlistfilter" class="form-control dropdown-menu" style="height:100px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
@@ -208,8 +208,8 @@
                             <i class="fa fa-male"></i>
                         </button>
-                        <div class="dropdown-menu active" style="min-height:119px;min-width:auto;">
-                            <div id="containment-wrapper" align="center" style="min-width:auto;height:119px;">
+                        <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
+                            <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
                                 <img id="navimg" src="{{navimgsrc}}" alt=""></img>
                                 <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition">
                                 </div>
@@ -346,6 +346,8 @@
         })
 </script>
     });-->
+
+<script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
 <script>
     $(function () {
         $("#transparencyScale").draggable();
@@ -68,41 +68,42 @@
             $('[data-toggle="tooltip"]').tooltip();
         })
-
-        if (window.location.pathname == "/AIA/da-view-list") {
+        var appPath = window.location.pathname.split("/")[1];
+        if (window.location.pathname == "/" + appPath + "/da-view-list") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:first-child a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/3dAnatomy") {
+
+        else if (window.location.pathname == "/" + appPath + "/3dAnatomy") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(2) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/clinical-illustrations") {
+        else if (window.location.pathname == "/" + appPath + "/clinical-illustrations") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(3) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/clinical-animations") {
+        else if (window.location.pathname == "/" + appPath + "/clinical-animations") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(4) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/Link/encyclopedia") {
+        else if (window.location.pathname == "/" + appPath + "/Link/encyclopedia") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(5) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/curriculum-builder") {
+        else if (window.location.pathname == "/" + appPath + "/curriculum-builder") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(6) a").addClass('active');
@@ -110,7 +111,7 @@
         }
-        else if (window.location.pathname == "/AIA/anatomy-test") {
+        else if (window.location.pathname == "/" + appPath + "/anatomy-test") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(7) a").addClass('active');
@@ -118,56 +119,56 @@
         }
-        else if (window.location.pathname == "/AIA/Link/IP-10") {
+        else if (window.location.pathname == "/" + appPath + "/Link/IP-10") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(8) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/lab-exercises") {
+        else if (window.location.pathname == "/" + appPath + "/lab-exercises") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(9) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/Link/indepth-reports") {
+        else if (window.location.pathname == "/" + appPath + "/Link/indepth-reports") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(10) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/Link/complementary-and-alternate-medicine") {
+        else if (window.location.pathname == "/" + appPath + "/Link/complementary-and-alternate-medicine") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(11) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/ADAM-Images") {
+        else if (window.location.pathname == "/" + appPath + "/ADAM-Images") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(12) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/Link/bodyguide") {
+        else if (window.location.pathname == "/" + appPath + "/Link/bodyguide") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(13) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/Link/symptom-navigator") {
+        else if (window.location.pathname == "/" + appPath + "/Link/symptom-navigator") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(14) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/Link/wellness-tools") {
+        else if (window.location.pathname == "/" + appPath + "/Link/wellness-tools") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(15) a").addClass('active');
         }
-        else if (window.location.pathname == "/AIA/ADAM-on-demand") {
+        else if (window.location.pathname == "/"+ appPath + "/ADAM-on-demand") {
             $(".nav-sidebar li a").removeClass('active');
             $(".nav-sidebar li:nth-child(16) a").addClass('active');
@@ -2,18 +2,20 @@
 var bodyLayerData;
 var bodyArtData;
-loadBodyViewData = function (currentBodyViewId) {
+loadBodyViewData = function (currentBodyViewId)
+{
     //1.
     var bodyRegionjsonPath = '~/../content/data/json/da/da_dat_brview.json';
-
+  
     var req = new XMLHttpRequest();
     req.open("GET", bodyRegionjsonPath, true);
     req.setRequestHeader("Content-type", "application/json");
     req.onreadystatechange = function () {
-        if (req.readyState == 4 && req.status == 200) {
+        if (req.readyState == 4 && req.status == 200)
+        {
             bodyRegionData = JSON.parse(req.responseText);
             console.log("bodyRegionData returned: " + bodyRegionData);
@@ -30,8 +32,8 @@ loadLayerDataForCurrentBodyView = function (currentBodyViewId) {
     //1.
     var bgArtJsonPath = '';
     var CommonViewId = 0;
-
-
+    
+    
     //2.
     var layerJsonPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_layer_' + currentBodyViewId + '.json';
@@ -53,7 +55,7 @@ loadLayerDataForCurrentBodyView = function (currentBodyViewId) {
 }
 loadBodyArtData = function () {
-
+  
     var bgArtJsonPath = '';
@@ -81,7 +83,7 @@ loadBodyArtData = function () {
 };
 self.onmessage = function (e) {
-
+    
     loadBodyViewData(e.data.currentViewId);
 }
 \ No newline at end of file
 <!DOCTYPE html>
 <html lang="en" ng-cloak ng-app="AIA">
 <head>
-    <base href="/AIAHTML5/" />
+    <base href="/AIA/" />
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">-->
@@ -434,7 +434,7 @@
     <script src="app/controllers/LinkController.js"></script>
     <script src="app/services/DataService.js"></script>
     <script src="libs/jquery/jquery_plugin/jqueryui.js"></script>
-
+  
     <script>
         $(function () {
@@ -3,7 +3,7 @@ var doneBRID = [];
 var abc = 'hello';
 previousGrayImageDataList = [];
 getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, coloredImageData, grayImageData, bodyRegionId, canvasId) {
-    console.log('for bodyRegionId: ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
+    console.log('for bodyRegionId in worker process: ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
     console.log(grayImageData);
     var matchedRGBLocationInBodyRegion = [];
     var matched;