ADAM / AIAHTML5

Commit 7cd3de0b2111cad553d5234fbbea37779132f59d

Authored by Amrita Vishnoi
2 parents b9e0d9ed 54473082

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

Inline Side-by-side
Showing 6 changed files with 241 additions and 231 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @7cd3de0
... ... @@ -560,7 +560,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
560 560 theme: 'success',
561 561 currentController: 'CAController',
562 562 parentSlug: 'clinical-animations',
563   - 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"' +
  563 + 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"' +
564 564 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo"' +
565 565 ' poster="' + $scope.poster + '"' +
566 566 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' +
... ... @@ -611,6 +611,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
611 611 if ($('.jsPanel-content').length > 0) {
612 612 $('.video-subtitle').css('margin-bottom', blackBorderHeight);
613 613 $('#divplayerinlineVideo').css('background', '#fff');
  614 + //Android > Clinical Animations > The animation does not fit to the screen in the Landscape mode.
  615 + var $ua = navigator.userAgent;
  616 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { $('.jsPanel-content').css("width", "100%"); }
614 617 }
615 618  
616 619 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @7cd3de0
... ... @@ -3012,7 +3012,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3012 3012  
3013 3013 $scope.highlightedBR = [];
3014 3014  
3015   - // if ($scope.layerNumber == 224) {
3016 3015  
3017 3016 var matchedTermListPath = '~/../content/data/json/da/body-views/1/BodySystem_' + $rootScope.systemNumber + '.json';
3018 3017 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
3029 3028 $('#spinner').css('visibility', 'hidden');
3030 3029  
3031 3030 //remove existing data and draw fresh data
3032   - for (var i = 0; i < $rootScope.grayImageDataList.length; i++) {
3033   - var grayCanvasID = 'imageCanvas' + parseInt(i + 1);
3034   - var grayCanvas = document.getElementById(grayCanvasID);
  3031 + $scope.removeCurrentHighlightedBodySystem();
3035 3032  
3036   - if (grayCanvas != null) {
3037   - var grayCanvasContext = grayCanvas.getContext("2d");
3038   -
3039   - var canvasHeight = grayCanvas.height;
3040   - var canvasWidth = grayCanvas.width;
3041   - grayCanvasContext.clearRect(0, 0, canvasHeight, canvasWidth)
3042   - grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
3043   - }
3044   - }
3045 3033  
3046 3034  
3047 3035 $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
4920 4908  
4921 4909  
4922 4910 //0. get current layer number
4923   - if (isResized) {
  4911 + if (isResized || isLayerChanged) {
4924 4912 //do nothing
4925   - }
4926   - else if (isLayerChanged) {
  4913 + $scope.transNumber = 100;
  4914 + $(".slider").slider('value', 100);
4927 4915  
4928 4916 }
4929 4917 else {
... ... @@ -5439,8 +5427,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5439 5427  
5440 5428 $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized) {
5441 5429  
5442   -
5443   -
5444 5430 var transNumber = $scope.transNumber;//txtTransparencyChange.value;
5445 5431 //this changes the transparency when transparency is already activated and user resizes or chage the layer
5446 5432  
... ... @@ -5465,12 +5451,17 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5465 5451 tempCtx.putImageData(imageD, 0, 0);
5466 5452 //}
5467 5453 }
  5454 +
  5455 +
  5456 +
5468 5457 // set every fourth value to the desired number of transparency
5469 5458 var imageD1 = tempCtx.getImageData(0, 0, Width, Height);
5470 5459 var imageData1 = imageD1.data;
5471 5460 var length = imageData.length;
5472 5461  
5473 5462 for (var i = 3; i < length; i += 4) {
  5463 +
  5464 +
5474 5465 if ($scope.voId == "9" || $scope.voId == "11") {
5475 5466  
5476 5467 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
8492 8483  
8493 8484 $rootScope.systemNumber = event.currentTarget.id;
8494 8485  
  8486 + if ($rootScope.systemNumber == 0) {
8495 8487  
8496   - //NIKITA
8497   - $rootScope.isHighlightBodyByBodySystem = true;
8498   - $scope.systemMatchedTermList = new jinqJs()
8499   - .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
8500   - .where('_SystemNumber == ' + event.currentTarget.id)
8501   - .select();
8502   -
8503   - if ($rootScope.isHighLight == false) {
8504   - //color the body gray
8505   - $rootScope.isHighLight = true
8506   - console.log('highLightBody from HighlightBodyByBodySystem')
8507   - $scope.highLightBody();
  8488 + console.log("inside HighlightBodyByBodySystem ..came inside current structure");
  8489 + //clear highlighted system
  8490 + $scope.removeCurrentHighlightedBodySystem();
  8491 + $scope.EnableUI();
8508 8492 }
  8493 +
8509 8494 else {
8510   - //This else is when user seraced anything then change the view and clicked on highlight options
8511   - //in this case body is already highlihted(gray) so no need to
8512   - if ($scope.grayedBR != null || $scope.grayedBR != undefined) {
8513   - if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.grayedBR.length == 9)) {
8514   - $scope.isAlreadyHighlighted = true;
8515   - }
8516   - else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) {
8517   - $scope.isAlreadyHighlighted = true;
8518   - }
8519   - else if ((($rootScope.viewOrientationId == '5')) && ($scope.grayedBR.length == 4)) {
8520   - $scope.isAlreadyHighlighted = true;
8521   - }
8522   - else if ((($rootScope.viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) {
8523   - $scope.isAlreadyHighlighted = true;
8524   - }
8525   - if (($scope.isAlreadyHighlighted == true && $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined && $scope.systemMatchedTermList.length > 0)) {
  8495 + //NIKITA
  8496 + $rootScope.isHighlightBodyByBodySystem = true;
  8497 + $scope.systemMatchedTermList = new jinqJs()
  8498 + .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
  8499 + .where('_SystemNumber == ' + event.currentTarget.id)
  8500 + .select();
8526 8501  
8527   - $scope.isLoading = true;
  8502 + if ($rootScope.isHighLight == false) {
  8503 + //color the body gray
  8504 + $rootScope.isHighLight = true
  8505 + console.log('highLightBody from HighlightBodyByBodySystem')
  8506 + $scope.highLightBody();
  8507 + }
  8508 + else {
  8509 + //This else is when user seraced anything then change the view and clicked on highlight options
  8510 + //in this case body is already highlihted(gray) so no need to
  8511 + if ($scope.grayedBR != null || $scope.grayedBR != undefined) {
  8512 + if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.grayedBR.length == 9)) {
  8513 + $scope.isAlreadyHighlighted = true;
  8514 + }
  8515 + else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) {
  8516 + $scope.isAlreadyHighlighted = true;
  8517 + }
  8518 + else if ((($rootScope.viewOrientationId == '5')) && ($scope.grayedBR.length == 4)) {
  8519 + $scope.isAlreadyHighlighted = true;
  8520 + }
  8521 + else if ((($rootScope.viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) {
  8522 + $scope.isAlreadyHighlighted = true;
  8523 + }
  8524 + if (($scope.isAlreadyHighlighted == true && $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined && $scope.systemMatchedTermList.length > 0)) {
8528 8525  
8529   - $('#spinner').css('visibility', 'visible');
8530   - $timeout(function () { $scope.HighlightBodyByTermListForBodySystem($scope.systemMatchedTermList) }, 100);
  8526 + $scope.isLoading = true;
  8527 +
  8528 + $('#spinner').css('visibility', 'visible');
  8529 + $timeout(function () { $scope.HighlightBodyByTermListForBodySystem($scope.systemMatchedTermList) }, 100);
  8530 + }
8531 8531 }
8532 8532 }
8533   - }
8534   -
8535 8533  
8536   - //$rootScope.isLoading = true;
8537   - $('#spinner').css('visibility', 'visible');
8538 8534  
8539   - //NIKITA
8540   - // $rootScope.isHighlightBodyByBodySystem = true;
  8535 + //$rootScope.isLoading = true;
  8536 + $('#spinner').css('visibility', 'visible');
8541 8537  
8542   - //if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
  8538 +
  8539 + var viewtarget_highlightbody = angular.element(event.currentTarget);
  8540 + var title_highlightbody = viewtarget_highlightbody.attr('title');
8543 8541  
8544   - // $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100);
8545   - //}
  8542 + $scope.removeBodySyetemSelectionClass(title_highlightbody);
8546 8543  
  8544 + //Highlight button should be active
  8545 + $("#btnHighLight").addClass("btn-primary");
  8546 + $("#btnHighLight").removeClass("btn-black");
8547 8547  
8548   - var viewtarget_highlightbody = angular.element(event.currentTarget);
8549   - var title_highlightbody = viewtarget_highlightbody.attr('title');
  8548 + if (!$("#btnNormalMode").hasClass("btn-black")) {
  8549 + $("#btnNormalMode").addClass("btn-black");
  8550 + }
8550 8551  
8551   - $scope.removeBodySyetemSelectionClass(title_highlightbody);
  8552 + if (!$("#btnExtract").hasClass("btn-black")) {
  8553 + $("#btnExtract").addClass("btn-black");
  8554 + }
8552 8555  
8553   - //Highlight button should be active
8554   - $("#btnHighLight").addClass("btn-primary");
8555   - $("#btnHighLight").removeClass("btn-black");
  8556 + if ($("#btnExtract").hasClass("btn-primary")) {
  8557 + $("#btnExtract").removeClass("btn-primary");
  8558 + }
8556 8559  
8557   - if (!$("#btnNormalMode").hasClass("btn-black")) {
8558   - $("#btnNormalMode").addClass("btn-black");
  8560 + if ($("#btnNormalMode").hasClass("btn-primary")) {
  8561 + $("#btnNormalMode").removeClass("btn-primary");
  8562 + }
8559 8563 }
  8564 + }
8560 8565  
8561   - if (!$("#btnExtract").hasClass("btn-black")) {
8562   - $("#btnExtract").addClass("btn-black");
8563   - }
  8566 + $scope.removeCurrentHighlightedBodySystem = function(){
8564 8567  
8565   - if ($("#btnExtract").hasClass("btn-primary")) {
8566   - $("#btnExtract").removeClass("btn-primary");
8567   - }
  8568 + for (var i = 0; i < $rootScope.grayImageDataList.length; i++) {
  8569 + var grayCanvasID = 'imageCanvas' + parseInt(i + 1);
  8570 + var grayCanvas = document.getElementById(grayCanvasID);
8568 8571  
8569   - if ($("#btnNormalMode").hasClass("btn-primary")) {
8570   - $("#btnNormalMode").removeClass("btn-primary");
8571   - }
  8572 + if (grayCanvas != null) {
  8573 + var grayCanvasContext = grayCanvas.getContext("2d");
8572 8574  
  8575 + var canvasHeight = grayCanvas.height;
  8576 + var canvasWidth = grayCanvas.width;
  8577 + grayCanvasContext.clearRect(0, 0, canvasHeight, canvasWidth)
  8578 + grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
  8579 + }
  8580 + }
8573 8581 }
8574 8582  
8575 8583 $scope.removeBodySyetemSelectionClass = function (title_highlightbody) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @7cd3de0
... ... @@ -260,6 +260,112 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
260 260 //7. Highlight all system body list in left side
261 261 $scope.highlightBodySystemList();
262 262 }
  263 + $(".slider").slider({
  264 + min: 25,
  265 + max: 100,
  266 + value: 100,
  267 + range: "min",
  268 + orientation: "vertical",
  269 + slide: function (event, ui) {
  270 + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  271 + scope.$apply(function () {
  272 + scope.sliderVal = ui.value;
  273 + scope.removeSpeechBubble();
  274 + var relativeWidth = 0;
  275 + var relativeHeight = 0;
  276 + if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
  277 + if (ui.value == 100) {
  278 + relativeWidth = scope.ViewImageWidth;
  279 + relativeHeight = scope.ViewImageHeight
  280 + scope.sliderPercentValue = 1.0;
  281 + }
  282 + else if (ui.value == 85) {
  283 + relativeWidth = scope.ViewImageWidth * 0.85;
  284 + relativeHeight = scope.ViewImageHeight * 0.85;
  285 + scope.sliderPercentValue = 0.85;
  286 +
  287 + } else if (ui.value == 70) {
  288 + relativeWidth = scope.ViewImageWidth * 0.70;
  289 + relativeHeight = scope.ViewImageHeight * 0.70;
  290 + scope.sliderPercentValue = 0.70;
  291 + } else if (ui.value == 55) {
  292 +
  293 + relativeWidth = scope.ViewImageWidth * 0.55;
  294 + relativeHeight = scope.ViewImageHeight * 0.55;
  295 + scope.sliderPercentValue = 0.55;
  296 +
  297 + } else if (ui.value == 40) {
  298 +
  299 + relativeWidth = scope.ViewImageWidth * 0.40;
  300 + relativeHeight = scope.ViewImageHeight * 0.40;
  301 + scope.sliderPercentValue = 0.40;
  302 +
  303 + } else if (ui.value == 25) {
  304 +
  305 + relativeWidth = scope.ViewImageWidth * 0.25;
  306 + relativeHeight = scope.ViewImageHeight * 0.25;
  307 + scope.sliderPercentValue = 0.25;
  308 +
  309 + }
  310 + }
  311 +
  312 + if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
  313 + $("#modItemImage").css("width", relativeWidth + "px");
  314 + $("#modItemImage").css("height", relativeHeight + "px");
  315 + $("#aaDetailViewCanvas").css("width", relativeWidth + "px");
  316 + $("#modItemImage").css("height", relativeHeight + "px");
  317 +
  318 + $("#modItemImage").attr('src', '');
  319 +
  320 +
  321 + $("#aaDetailViewCanvas").remove();
  322 + //0.5 create canvas on the top of image so that I can draw a line over the canvas.
  323 + var canvas = document.createElement('canvas');
  324 + canvas.id = 'aaDetailViewCanvas';
  325 + canvas.className = 'aaCanvas';
  326 + canvas.height = relativeHeight;
  327 + canvas.width = relativeWidth;
  328 + canvas.style.left = '0px';
  329 + canvas.style.top = '0px';
  330 + canvas.style.position = "absolute";
  331 +
  332 + $("#canvasDiv").append(canvas);
  333 + scope.context = canvas.getContext("2d")
  334 + $("#modItemImage").attr('src', scope.OpenItemImagePath);
  335 + scope.isSliderChange = true;
  336 + var btnID = '';
  337 + $("div.tools div:eq(1) div").each(function () {
  338 + if ($(this).find("button").hasClass("btn-primary")) {
  339 + btnID = $(this).find("button").attr("id");
  340 + $('#' + btnID).removeClass("btn-black");
  341 + $('#' + btnID).addClass("btn-primary");
  342 + }
  343 + });
  344 + scope.isSelectedPinBtnClickedAftrSliderCange = true;
  345 + switch (btnID) {
  346 +
  347 + case "hidePinBtn":
  348 + break;
  349 + case "allPinBtn":
  350 + scope.showAllPins();
  351 + break;
  352 + case "selectedPin":
  353 + scope.showAllPins();
  354 + setTimeout(function () {
  355 + console.log(scope.allPinDataArray);
  356 + scope.activePinOnSliderChange();
  357 + }, 1000);
  358 + break;
  359 + }
  360 + }
  361 +
  362 + });
  363 + }
  364 + })
  365 + .slider("pips", {
  366 + rest: "label",
  367 + step: "15"
  368 + });
263 369 }, 500);
264 370 }
265 371  
... ... @@ -1745,6 +1851,51 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1745 1851 }
1746 1852 }
1747 1853 }
  1854 + $(document).ready(function () {
  1855 + var $ua = navigator.userAgent;
  1856 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  1857 +
  1858 + var jspanelContainerWidth = $(".jsPanel-content").css("width");
  1859 + $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });
  1860 + $("#ImagePanel").css("width", "100%");
  1861 +
  1862 + //hide pin button clicked
  1863 + $("#hidePinBtn").removeAttr("onclick");
  1864 + $("#hidePinBtn").on("touchstart", function () {
  1865 + var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1866 + rootScope.$apply(function () {
  1867 + rootScope.hidePins(event);
  1868 + });
  1869 + });
  1870 + //selected pin button clicked
  1871 + $("#selectedPin").removeAttr("onclick");
  1872 + $("#selectedPin").on("touchstart", function () {
  1873 + console.log('showSelectedPins is called')
  1874 + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1875 + scope.$apply(function () {
  1876 + scope.showSelectedPins(event);
  1877 + });
  1878 + });
  1879 + //all pin button clicked
  1880 + $("#allPinBtn").removeAttr("onclick");
  1881 + $("#allPinBtn").on("touchstart", function () {
  1882 + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1883 + scope.$apply(function () {
  1884 + scope.showAllPinsAfterHide(event);
  1885 + });
  1886 + });
  1887 + //comment-box button clicked
  1888 + $("#comment-box").removeAttr("onclick");
  1889 + $("#comment-box").on("touchstart", function () {
  1890 + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1891 + scope.$apply(function () {
  1892 + scope.ShowHideAnnotation(event);
  1893 + });
  1894 + });
  1895 +
  1896 + }
  1897 +
  1898 + });
1748 1899 }]);
1749 1900  
1750 1901  
... ... @@ -1883,153 +2034,3 @@ function onZoom(scope) {
1883 2034 }
1884 2035  
1885 2036  
1886   -$(document).ready(function () {
1887   - var $ua = navigator.userAgent;
1888   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
1889   -
1890   - var jspanelContainerWidth = $(".jsPanel-content").css("width");
1891   - $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });
1892   - $("#ImagePanel").css("width", "100%");
1893   -
1894   - //hide pin button clicked
1895   - $("#hidePinBtn").removeAttr("onclick");
1896   - $("#hidePinBtn").on("touchstart", function () {
1897   - var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1898   - rootScope.$apply(function () {
1899   - rootScope.hidePins(event);
1900   - });
1901   - });
1902   - //selected pin button clicked
1903   - $("#selectedPin").removeAttr("onclick");
1904   - $("#selectedPin").on("touchstart", function () {
1905   - console.log('showSelectedPins is called')
1906   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1907   - scope.$apply(function () {
1908   - scope.showSelectedPins(event);
1909   - });
1910   - });
1911   - //all pin button clicked
1912   - $("#allPinBtn").removeAttr("onclick");
1913   - $("#allPinBtn").on("touchstart", function () {
1914   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1915   - scope.$apply(function () {
1916   - scope.showAllPinsAfterHide(event);
1917   - });
1918   - });
1919   - //comment-box button clicked
1920   - $("#comment-box").removeAttr("onclick");
1921   - $("#comment-box").on("touchstart", function () {
1922   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1923   - scope.$apply(function () {
1924   - scope.ShowHideAnnotation(event);
1925   - });
1926   - });
1927   -
1928   - }
1929   - $(".slider").slider({
1930   - min: 25,
1931   - max: 100,
1932   - value: 100,
1933   - range: "min",
1934   - orientation: "vertical",
1935   - slide: function (event, ui) {
1936   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1937   - scope.$apply(function () {
1938   - scope.sliderVal = ui.value;
1939   - scope.removeSpeechBubble();
1940   - var relativeWidth = 0;
1941   - var relativeHeight = 0;
1942   - if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
1943   - if (ui.value == 100) {
1944   - relativeWidth = scope.ViewImageWidth;
1945   - relativeHeight = scope.ViewImageHeight
1946   - scope.sliderPercentValue = 1.0;
1947   - }
1948   - else if (ui.value == 85) {
1949   - relativeWidth = scope.ViewImageWidth * 0.85;
1950   - relativeHeight = scope.ViewImageHeight * 0.85;
1951   - scope.sliderPercentValue = 0.85;
1952   -
1953   - } else if (ui.value == 70) {
1954   - relativeWidth = scope.ViewImageWidth * 0.70;
1955   - relativeHeight = scope.ViewImageHeight * 0.70;
1956   - scope.sliderPercentValue = 0.70;
1957   - } else if (ui.value == 55) {
1958   -
1959   - relativeWidth = scope.ViewImageWidth * 0.55;
1960   - relativeHeight = scope.ViewImageHeight * 0.55;
1961   - scope.sliderPercentValue = 0.55;
1962   -
1963   - } else if (ui.value == 40) {
1964   -
1965   - relativeWidth = scope.ViewImageWidth * 0.40;
1966   - relativeHeight = scope.ViewImageHeight * 0.40;
1967   - scope.sliderPercentValue = 0.40;
1968   -
1969   - } else if (ui.value == 25) {
1970   -
1971   - relativeWidth = scope.ViewImageWidth * 0.25;
1972   - relativeHeight = scope.ViewImageHeight * 0.25;
1973   - scope.sliderPercentValue = 0.25;
1974   -
1975   - }
1976   - }
1977   -
1978   - if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
1979   - $("#modItemImage").css("width", relativeWidth + "px");
1980   - $("#modItemImage").css("height", relativeHeight + "px");
1981   - $("#aaDetailViewCanvas").css("width", relativeWidth + "px");
1982   - $("#modItemImage").css("height", relativeHeight + "px");
1983   -
1984   - $("#modItemImage").attr('src', '');
1985   -
1986   -
1987   - $("#aaDetailViewCanvas").remove();
1988   - //0.5 create canvas on the top of image so that I can draw a line over the canvas.
1989   - var canvas = document.createElement('canvas');
1990   - canvas.id = 'aaDetailViewCanvas';
1991   - canvas.className = 'aaCanvas';
1992   - canvas.height = relativeHeight;
1993   - canvas.width = relativeWidth;
1994   - canvas.style.left = '0px';
1995   - canvas.style.top = '0px';
1996   - canvas.style.position = "absolute";
1997   -
1998   - $("#canvasDiv").append(canvas);
1999   - scope.context = canvas.getContext("2d")
2000   - $("#modItemImage").attr('src', scope.OpenItemImagePath);
2001   - scope.isSliderChange = true;
2002   - var btnID = '';
2003   - $("div.tools div:eq(1) div").each(function () {
2004   - if ($(this).find("button").hasClass("btn-primary")) {
2005   - btnID = $(this).find("button").attr("id");
2006   - $('#' + btnID).removeClass("btn-black");
2007   - $('#' + btnID).addClass("btn-primary");
2008   - }
2009   - });
2010   - scope.isSelectedPinBtnClickedAftrSliderCange = true;
2011   - switch (btnID) {
2012   -
2013   - case "hidePinBtn":
2014   - break;
2015   - case "allPinBtn":
2016   - scope.showAllPins();
2017   - break;
2018   - case "selectedPin":
2019   - scope.showAllPins();
2020   - setTimeout(function () {
2021   - console.log(scope.allPinDataArray);
2022   - scope.activePinOnSliderChange();
2023   - }, 1000);
2024   - break;
2025   - }
2026   - }
2027   -
2028   - });
2029   - }
2030   - })
2031   - .slider("pips", {
2032   - rest: "label",
2033   - step: "15"
2034   - });
2035   -});
2036 2037 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @7cd3de0
... ... @@ -241,12 +241,10 @@
241 241 });
242 242 });
243 243 </script>
244   -<script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
  244 +
245 245  
246 246 <script>
247 247 $(function () {
248 248 $("#draggable").draggable();
249 249 });
250 250 </script>
251   -
252   -<script src="app/controllers/TileViewListController.js"></script>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @7cd3de0
... ... @@ -168,7 +168,7 @@
168 168 <div class="custom-tooltip">Highlight Options</div>
169 169 <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>
170 170 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
171   - <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
  171 + <li ng-class="CurrentStructure"><a href="#" title="Current Structure" id="0" onclick="OnBodySystemSelection(event)">Current Structure</a></li>
172 172 <li role="separator" class="divider"></li>
173 173 <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
174 174 <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @7cd3de0
... ... @@ -1448,7 +1448,6 @@
1448 1448 <script src="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js"></script>
1449 1449 <script src="libs/video_4_12_11/video_4_12_11.js"></script>
1450 1450 <script src="libs/jquery/jquery_plugin/SpeechBubble/bubble.js"></script>
1451   - <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
1452 1451 <!--<script src="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.min.js"></script>-->
1453 1452 <script src="app/main/AIA.js"></script>
1454 1453 <script src="app/main/Link.js"></script>
... ... @@ -1479,6 +1478,7 @@
1479 1478 <script src="app/services/DataService.js"></script>
1480 1479 <script src="app/services/TermService.js"></script>
1481 1480 <script src="libs/jquery/jquery_plugin/jqueryui.js"></script>
  1481 + <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
1482 1482  
1483 1483 <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
1484 1484  
... ...