Merge branch 'Develop-IPAD-MAC' into QA-IPAD-MAC

Amrita Vishnoi
2 parents b9e0d9ed 54473082
Showing 6 changed files with 241 additions and 231 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -560,7 +560,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               theme: 'success',
                               currentController: 'CAController',
                               parentSlug: 'clinical-animations',
-                              content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#caVideoPanel").css("width", "100%"); }videojs("#playerinlineVideo").pause();$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script><div id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
+                              content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo").pause();$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script><div id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
                                 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo"' +
                                 ' poster="' + $scope.poster + '"' +
                                  'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' +
@@ -611,6 +611,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           if ($('.jsPanel-content').length > 0) {
                               $('.video-subtitle').css('margin-bottom', blackBorderHeight);
                               $('#divplayerinlineVideo').css('background', '#fff');
+                              //Android > Clinical Animations > The animation does not fit to the screen in the Landscape mode.
+                              var $ua = navigator.userAgent;
+                              if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { $('.jsPanel-content').css("width", "100%"); }
                           }
                       }
@@ -3012,7 +3012,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $scope.highlightedBR = [];
-            // if ($scope.layerNumber == 224) {
             var matchedTermListPath = '~/../content/data/json/da/body-views/1/BodySystem_' + $rootScope.systemNumber + '.json';
             var grayImageDataVar = null;
@@ -3029,19 +3028,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                            $('#spinner').css('visibility', 'hidden');
                            //remove existing data and draw fresh data
-                           for (var i = 0; i < $rootScope.grayImageDataList.length; i++) {
-                               var grayCanvasID = 'imageCanvas' + parseInt(i + 1);
-                               var grayCanvas = document.getElementById(grayCanvasID);
+                           $scope.removeCurrentHighlightedBodySystem();
-                               if (grayCanvas != null) {
-                                   var grayCanvasContext = grayCanvas.getContext("2d");
-
-                                   var canvasHeight = grayCanvas.height;
-                                   var canvasWidth = grayCanvas.width;
-                                   grayCanvasContext.clearRect(0, 0, canvasHeight, canvasWidth)
-                                   grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
-                               }
-                           }
                            $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
@@ -4920,10 +4908,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             //0. get current layer number
-            if (isResized) {
+            if (isResized || isLayerChanged) {
                 //do nothing
-            }
-            else if (isLayerChanged) {
+                $scope.transNumber = 100;
+                $(".slider").slider('value', 100);
             }
             else {
@@ -5439,8 +5427,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized) {
-
-
             var transNumber = $scope.transNumber;//txtTransparencyChange.value;
             //this changes the transparency when transparency is already activated and user resizes or chage the layer
@@ -5465,12 +5451,17 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 tempCtx.putImageData(imageD, 0, 0);
                 //}
             }
+
+          
+
             // set every fourth value to the desired number of transparency
             var imageD1 = tempCtx.getImageData(0, 0, Width, Height);
             var imageData1 = imageD1.data;
             var length = imageData.length;
             for (var i = 3; i < length; i += 4) {
+
+              
                 if ($scope.voId == "9" || $scope.voId == "11") {
                     if (imageData1[i] == 0) {
@@ -8492,84 +8483,101 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $rootScope.systemNumber = event.currentTarget.id;
+            if ($rootScope.systemNumber == 0) {
-            //NIKITA
-            $rootScope.isHighlightBodyByBodySystem = true;
-            $scope.systemMatchedTermList = new jinqJs()
-                                         .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
-                                         .where('_SystemNumber == ' + event.currentTarget.id)
-                                         .select();
-
-            if ($rootScope.isHighLight == false) {
-                //color  the body gray
-                $rootScope.isHighLight = true
-                console.log('highLightBody from HighlightBodyByBodySystem')
-                $scope.highLightBody();
+                console.log("inside HighlightBodyByBodySystem ..came inside current structure");
+                //clear highlighted system
+                $scope.removeCurrentHighlightedBodySystem();
+                $scope.EnableUI();
             }
+
             else {
-                //This else is when user seraced anything then change the view and clicked on highlight options 
-                //in this case body is already highlihted(gray) so no need to 
-                if ($scope.grayedBR != null || $scope.grayedBR != undefined) {
-                    if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.grayedBR.length == 9)) {
-                        $scope.isAlreadyHighlighted = true;
-                    }
-                    else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) {
-                        $scope.isAlreadyHighlighted = true;
-                    }
-                    else if ((($rootScope.viewOrientationId == '5')) && ($scope.grayedBR.length == 4)) {
-                        $scope.isAlreadyHighlighted = true;
-                    }
-                    else if ((($rootScope.viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) {
-                        $scope.isAlreadyHighlighted = true;
-                    }
-                    if (($scope.isAlreadyHighlighted == true && $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined && $scope.systemMatchedTermList.length > 0)) {
+                //NIKITA
+                $rootScope.isHighlightBodyByBodySystem = true;
+                $scope.systemMatchedTermList = new jinqJs()
+                                             .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
+                                             .where('_SystemNumber == ' + event.currentTarget.id)
+                                             .select();
-                        $scope.isLoading = true;
+                if ($rootScope.isHighLight == false) {
+                    //color  the body gray
+                    $rootScope.isHighLight = true
+                    console.log('highLightBody from HighlightBodyByBodySystem')
+                    $scope.highLightBody();
+                }
+                else {
+                    //This else is when user seraced anything then change the view and clicked on highlight options 
+                    //in this case body is already highlihted(gray) so no need to 
+                    if ($scope.grayedBR != null || $scope.grayedBR != undefined) {
+                        if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.grayedBR.length == 9)) {
+                            $scope.isAlreadyHighlighted = true;
+                        }
+                        else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) {
+                            $scope.isAlreadyHighlighted = true;
+                        }
+                        else if ((($rootScope.viewOrientationId == '5')) && ($scope.grayedBR.length == 4)) {
+                            $scope.isAlreadyHighlighted = true;
+                        }
+                        else if ((($rootScope.viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) {
+                            $scope.isAlreadyHighlighted = true;
+                        }
+                        if (($scope.isAlreadyHighlighted == true && $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined && $scope.systemMatchedTermList.length > 0)) {
-                        $('#spinner').css('visibility', 'visible');
-                        $timeout(function () { $scope.HighlightBodyByTermListForBodySystem($scope.systemMatchedTermList) }, 100);
+                            $scope.isLoading = true;
+
+                            $('#spinner').css('visibility', 'visible');
+                            $timeout(function () { $scope.HighlightBodyByTermListForBodySystem($scope.systemMatchedTermList) }, 100);
+                        }
                     }
                 }
-            }
-
-            //$rootScope.isLoading = true;
-            $('#spinner').css('visibility', 'visible');
-            //NIKITA
-            //  $rootScope.isHighlightBodyByBodySystem = true;
+                //$rootScope.isLoading = true;
+                $('#spinner').css('visibility', 'visible');
-            //if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
+       
+                var viewtarget_highlightbody = angular.element(event.currentTarget);
+                var title_highlightbody = viewtarget_highlightbody.attr('title');
-            //    $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100);
-            //}
+                $scope.removeBodySyetemSelectionClass(title_highlightbody);
+                //Highlight button should be active
+                $("#btnHighLight").addClass("btn-primary");
+                $("#btnHighLight").removeClass("btn-black");
-            var viewtarget_highlightbody = angular.element(event.currentTarget);
-            var title_highlightbody = viewtarget_highlightbody.attr('title');
+                if (!$("#btnNormalMode").hasClass("btn-black")) {
+                    $("#btnNormalMode").addClass("btn-black");
+                }
-            $scope.removeBodySyetemSelectionClass(title_highlightbody);
+                if (!$("#btnExtract").hasClass("btn-black")) {
+                    $("#btnExtract").addClass("btn-black");
+                }
-            //Highlight button should be active
-            $("#btnHighLight").addClass("btn-primary");
-            $("#btnHighLight").removeClass("btn-black");
+                if ($("#btnExtract").hasClass("btn-primary")) {
+                    $("#btnExtract").removeClass("btn-primary");
+                }
-            if (!$("#btnNormalMode").hasClass("btn-black")) {
-                $("#btnNormalMode").addClass("btn-black");
+                if ($("#btnNormalMode").hasClass("btn-primary")) {
+                    $("#btnNormalMode").removeClass("btn-primary");
+                }
             }
+        }
-            if (!$("#btnExtract").hasClass("btn-black")) {
-                $("#btnExtract").addClass("btn-black");
-            }
+        $scope.removeCurrentHighlightedBodySystem = function(){
-            if ($("#btnExtract").hasClass("btn-primary")) {
-                $("#btnExtract").removeClass("btn-primary");
-            }
+            for (var i = 0; i < $rootScope.grayImageDataList.length; i++) {
+                var grayCanvasID = 'imageCanvas' + parseInt(i + 1);
+                var grayCanvas = document.getElementById(grayCanvasID);
-            if ($("#btnNormalMode").hasClass("btn-primary")) {
-                $("#btnNormalMode").removeClass("btn-primary");
-            }
+                if (grayCanvas != null) {
+                    var grayCanvasContext = grayCanvas.getContext("2d");
+                    var canvasHeight = grayCanvas.height;
+                    var canvasWidth = grayCanvas.width;
+                    grayCanvasContext.clearRect(0, 0, canvasHeight, canvasWidth)
+                    grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
+                }
+            }
         }
         $scope.removeBodySyetemSelectionClass = function (title_highlightbody) {
@@ -260,6 +260,112 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         //7. Highlight all system body list in left side
                         $scope.highlightBodySystemList();
                     }
+                    $(".slider").slider({
+                        min: 25,
+                        max: 100,
+                        value: 100,
+                        range: "min",
+                        orientation: "vertical",
+                        slide: function (event, ui) {
+                            var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+                            scope.$apply(function () {
+                                scope.sliderVal = ui.value;
+                                scope.removeSpeechBubble();
+                                var relativeWidth = 0;
+                                var relativeHeight = 0;
+                                if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
+                                    if (ui.value == 100) {
+                                        relativeWidth = scope.ViewImageWidth;
+                                        relativeHeight = scope.ViewImageHeight
+                                        scope.sliderPercentValue = 1.0;
+                                    }
+                                    else if (ui.value == 85) {
+                                        relativeWidth = scope.ViewImageWidth * 0.85;
+                                        relativeHeight = scope.ViewImageHeight * 0.85;
+                                        scope.sliderPercentValue = 0.85;
+
+                                    } else if (ui.value == 70) {
+                                        relativeWidth = scope.ViewImageWidth * 0.70;
+                                        relativeHeight = scope.ViewImageHeight * 0.70;
+                                        scope.sliderPercentValue = 0.70;
+                                    } else if (ui.value == 55) {
+
+                                        relativeWidth = scope.ViewImageWidth * 0.55;
+                                        relativeHeight = scope.ViewImageHeight * 0.55;
+                                        scope.sliderPercentValue = 0.55;
+
+                                    } else if (ui.value == 40) {
+
+                                        relativeWidth = scope.ViewImageWidth * 0.40;
+                                        relativeHeight = scope.ViewImageHeight * 0.40;
+                                        scope.sliderPercentValue = 0.40;
+
+                                    } else if (ui.value == 25) {
+
+                                        relativeWidth = scope.ViewImageWidth * 0.25;
+                                        relativeHeight = scope.ViewImageHeight * 0.25;
+                                        scope.sliderPercentValue = 0.25;
+
+                                    }
+                                }
+
+                                if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
+                                    $("#modItemImage").css("width", relativeWidth + "px");
+                                    $("#modItemImage").css("height", relativeHeight + "px");
+                                    $("#aaDetailViewCanvas").css("width", relativeWidth + "px");
+                                    $("#modItemImage").css("height", relativeHeight + "px");
+
+                                    $("#modItemImage").attr('src', '');
+
+
+                                    $("#aaDetailViewCanvas").remove();
+                                    //0.5 create canvas on the top of image so that I can draw a line over the canvas.
+                                    var canvas = document.createElement('canvas');
+                                    canvas.id = 'aaDetailViewCanvas';
+                                    canvas.className = 'aaCanvas';
+                                    canvas.height = relativeHeight;
+                                    canvas.width = relativeWidth;
+                                    canvas.style.left = '0px';
+                                    canvas.style.top = '0px';
+                                    canvas.style.position = "absolute";
+
+                                    $("#canvasDiv").append(canvas);
+                                    scope.context = canvas.getContext("2d")
+                                    $("#modItemImage").attr('src', scope.OpenItemImagePath);
+                                    scope.isSliderChange = true;
+                                    var btnID = '';
+                                    $("div.tools div:eq(1) div").each(function () {
+                                        if ($(this).find("button").hasClass("btn-primary")) {
+                                            btnID = $(this).find("button").attr("id");
+                                            $('#' + btnID).removeClass("btn-black");
+                                            $('#' + btnID).addClass("btn-primary");
+                                        }
+                                    });
+                                    scope.isSelectedPinBtnClickedAftrSliderCange = true;
+                                    switch (btnID) {
+
+                                        case "hidePinBtn":
+                                            break;
+                                        case "allPinBtn":
+                                            scope.showAllPins();
+                                            break;
+                                        case "selectedPin":
+                                            scope.showAllPins();
+                                            setTimeout(function () {
+                                                console.log(scope.allPinDataArray);
+                                                scope.activePinOnSliderChange();
+                                            }, 1000);
+                                            break;
+                                    }
+                                }
+
+                            });
+                        }
+                    })
+ .slider("pips", {
+     rest: "label",
+     step: "15"
+ });
                 }, 500);
             }
@@ -1745,6 +1851,51 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             }
         }
     }
+    $(document).ready(function () {
+        var $ua = navigator.userAgent;
+        if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+
+            var jspanelContainerWidth = $(".jsPanel-content").css("width");
+            $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });
+            $("#ImagePanel").css("width", "100%");
+
+            //hide pin button clicked
+            $("#hidePinBtn").removeAttr("onclick");
+            $("#hidePinBtn").on("touchstart", function () {
+                var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+                rootScope.$apply(function () {
+                    rootScope.hidePins(event);
+                });
+            });
+            //selected pin button clicked
+            $("#selectedPin").removeAttr("onclick");
+            $("#selectedPin").on("touchstart", function () {
+                console.log('showSelectedPins is called')
+                var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+                scope.$apply(function () {
+                    scope.showSelectedPins(event);
+                });
+            });
+            //all pin button clicked
+            $("#allPinBtn").removeAttr("onclick");
+            $("#allPinBtn").on("touchstart", function () {
+                var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+                scope.$apply(function () {
+                    scope.showAllPinsAfterHide(event);
+                });
+            });
+            //comment-box button clicked
+            $("#comment-box").removeAttr("onclick");
+            $("#comment-box").on("touchstart", function () {
+                var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+                scope.$apply(function () {
+                    scope.ShowHideAnnotation(event);
+                });
+            });
+
+        }
+    
+    }); 
 }]);
@@ -1883,153 +2034,3 @@ function onZoom(scope) {
 }
-$(document).ready(function () {
-    var $ua = navigator.userAgent;
-    if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
-
-        var jspanelContainerWidth = $(".jsPanel-content").css("width");
-        $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });
-        $("#ImagePanel").css("width", "100%");
-
-        //hide pin button clicked
-        $("#hidePinBtn").removeAttr("onclick");
-        $("#hidePinBtn").on("touchstart", function () {
-            var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-            rootScope.$apply(function () {
-                rootScope.hidePins(event);
-            });
-        });
-        //selected pin button clicked
-        $("#selectedPin").removeAttr("onclick");
-        $("#selectedPin").on("touchstart", function () {
-            console.log('showSelectedPins is called')
-            var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-            scope.$apply(function () {
-                scope.showSelectedPins(event);
-            });
-        });
-        //all pin button clicked
-        $("#allPinBtn").removeAttr("onclick");
-        $("#allPinBtn").on("touchstart", function () {
-            var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-            scope.$apply(function () {
-                scope.showAllPinsAfterHide(event);
-            });
-        });
-        //comment-box button clicked
-        $("#comment-box").removeAttr("onclick");
-        $("#comment-box").on("touchstart", function () {
-            var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-            scope.$apply(function () {
-                scope.ShowHideAnnotation(event);
-            });
-        });
-
-    }
-    $(".slider").slider({
-        min: 25,
-        max: 100,
-        value: 100,
-        range: "min",
-        orientation: "vertical",
-        slide: function (event, ui) {
-            var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-            scope.$apply(function () {
-                scope.sliderVal = ui.value;
-                scope.removeSpeechBubble();
-                var relativeWidth = 0;
-                var relativeHeight = 0;
-                if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
-                    if (ui.value == 100) {
-                        relativeWidth = scope.ViewImageWidth;
-                        relativeHeight = scope.ViewImageHeight
-                        scope.sliderPercentValue = 1.0;
-                    }
-                    else if (ui.value == 85) {
-                        relativeWidth = scope.ViewImageWidth * 0.85;
-                        relativeHeight = scope.ViewImageHeight * 0.85;
-                        scope.sliderPercentValue = 0.85;
-
-                    } else if (ui.value == 70) {
-                        relativeWidth = scope.ViewImageWidth * 0.70;
-                        relativeHeight = scope.ViewImageHeight * 0.70;
-                        scope.sliderPercentValue = 0.70;
-                    } else if (ui.value == 55) {
-
-                        relativeWidth = scope.ViewImageWidth * 0.55;
-                        relativeHeight = scope.ViewImageHeight * 0.55;
-                        scope.sliderPercentValue = 0.55;
-
-                    } else if (ui.value == 40) {
-
-                        relativeWidth = scope.ViewImageWidth * 0.40;
-                        relativeHeight = scope.ViewImageHeight * 0.40;
-                        scope.sliderPercentValue = 0.40;
-
-                    } else if (ui.value == 25) {
-
-                        relativeWidth = scope.ViewImageWidth * 0.25;
-                        relativeHeight = scope.ViewImageHeight * 0.25;
-                        scope.sliderPercentValue = 0.25;
-
-                    }
-                }
-
-                if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
-                    $("#modItemImage").css("width", relativeWidth + "px");
-                    $("#modItemImage").css("height", relativeHeight + "px");
-                    $("#aaDetailViewCanvas").css("width", relativeWidth + "px");
-                    $("#modItemImage").css("height", relativeHeight + "px");
-
-                    $("#modItemImage").attr('src', '');
-
-
-                    $("#aaDetailViewCanvas").remove();
-                    //0.5 create canvas on the top of image so that I can draw a line over the canvas.
-                    var canvas = document.createElement('canvas');
-                    canvas.id = 'aaDetailViewCanvas';
-                    canvas.className = 'aaCanvas';
-                    canvas.height = relativeHeight;
-                    canvas.width = relativeWidth;
-                    canvas.style.left = '0px';
-                    canvas.style.top = '0px';
-                    canvas.style.position = "absolute";
-
-                    $("#canvasDiv").append(canvas);
-                    scope.context = canvas.getContext("2d")
-                    $("#modItemImage").attr('src', scope.OpenItemImagePath);
-                    scope.isSliderChange = true;
-                    var btnID = '';
-                    $("div.tools div:eq(1) div").each(function () {
-                        if ($(this).find("button").hasClass("btn-primary")) {
-                            btnID = $(this).find("button").attr("id");
-                            $('#' + btnID).removeClass("btn-black");
-                            $('#' + btnID).addClass("btn-primary");
-                        }
-                    });
-                    scope.isSelectedPinBtnClickedAftrSliderCange = true;
-                    switch (btnID) {
-
-                        case "hidePinBtn":
-                            break;
-                        case "allPinBtn":
-                            scope.showAllPins();
-                            break;
-                        case "selectedPin":
-                            scope.showAllPins();
-                            setTimeout(function () {
-                                console.log(scope.allPinDataArray);
-                                scope.activePinOnSliderChange();
-                            }, 1000);
-                            break;
-                    }
-                }
-
-            });
-        }
-    })
- .slider("pips", {
-     rest: "label",
-     step: "15"
- });
-});
 \ No newline at end of file
@@ -241,12 +241,10 @@
         });
     });
 </script>
-<script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
+
 <script>
     $(function () {
         $("#draggable").draggable();
     });
 </script>
-
-<script src="app/controllers/TileViewListController.js"></script>
@@ -168,7 +168,7 @@
                     <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>
                     <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                        <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
+                        <li ng-class="CurrentStructure"><a href="#" title="Current Structure" id="0" onclick="OnBodySystemSelection(event)">Current Structure</a></li>
                         <li role="separator" class="divider"></li>
                         <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
                         <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
@@ -1448,7 +1448,6 @@
     <script src="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js"></script>
     <script src="libs/video_4_12_11/video_4_12_11.js"></script>
     <script src="libs/jquery/jquery_plugin/SpeechBubble/bubble.js"></script>
-    <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
     <!--<script src="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.min.js"></script>-->
     <script src="app/main/AIA.js"></script>
     <script src="app/main/Link.js"></script>
@@ -1479,6 +1478,7 @@
     <script src="app/services/DataService.js"></script>
     <script src="app/services/TermService.js"></script>
     <script src="libs/jquery/jquery_plugin/jqueryui.js"></script>
+    <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>