Commit 01d3b33f458a18d58f6fe634ae5f4d6ba897c69b
1 parent
7c05a26c
brnach wih issues
Showing
3 changed files
with
288 additions
and
298 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -592,14 +592,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -592,14 +592,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
592 | 592 | ||
593 | $("#layerChangeSlider").slider({ | 593 | $("#layerChangeSlider").slider({ |
594 | orientation: "vertical", | 594 | orientation: "vertical", |
595 | - range: "max", | 595 | + range: "max", |
596 | min: 0, | 596 | min: 0, |
597 | value: 0, | 597 | value: 0, |
598 | slide: function (event, ui) { | 598 | slide: function (event, ui) { |
599 | - }, | 599 | + }, |
600 | 600 | ||
601 | stop: function (event, ui) { | 601 | stop: function (event, ui) { |
602 | - | 602 | + |
603 | var la; | 603 | var la; |
604 | var rootScope = angular.element(document.getElementById("bo")).scope(); | 604 | var rootScope = angular.element(document.getElementById("bo")).scope(); |
605 | rootScope.$apply(function () { | 605 | rootScope.$apply(function () { |
@@ -652,24 +652,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -652,24 +652,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
652 | }) | 652 | }) |
653 | // $rootScope.languageArray = []; | 653 | // $rootScope.languageArray = []; |
654 | $rootScope.loadSearchDataForBodyView = function () { | 654 | $rootScope.loadSearchDataForBodyView = function () { |
655 | - | 655 | + |
656 | var languageArray = []; | 656 | var languageArray = []; |
657 | $rootScope.vocabTermDataArray = []; | 657 | $rootScope.vocabTermDataArray = []; |
658 | var languageArray = $rootScope.lexiconLanguageArray; | 658 | var languageArray = $rootScope.lexiconLanguageArray; |
659 | - | 659 | + |
660 | console.log(languageArray.length); | 660 | console.log(languageArray.length); |
661 | console.log('loadSearchDataForBodyView'); | 661 | console.log('loadSearchDataForBodyView'); |
662 | - | 662 | + |
663 | var currentBodyViewId = localStorage.getItem("currentBodyViewId"); | 663 | var currentBodyViewId = localStorage.getItem("currentBodyViewId"); |
664 | - | 664 | + |
665 | for (var i = 0; i <= languageArray.length - 1; i++) { | 665 | for (var i = 0; i <= languageArray.length - 1; i++) { |
666 | var searchWorker = new Worker('search-wp.js'); | 666 | var searchWorker = new Worker('search-wp.js'); |
667 | - | 667 | + |
668 | //push workers in array to further used the refernece to delete the workers | 668 | //push workers in array to further used the refernece to delete the workers |
669 | $scope.runningSearchWorkers.push({ 'workerName': searchWorker }) | 669 | $scope.runningSearchWorkers.push({ 'workerName': searchWorker }) |
670 | 670 | ||
671 | //console.log('for bodyRegionId = ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")) | 671 | //console.log('for bodyRegionId = ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")) |
672 | - | 672 | + |
673 | 673 | ||
674 | searchWorker.postMessage({ | 674 | searchWorker.postMessage({ |
675 | 675 | ||
@@ -679,38 +679,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -679,38 +679,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
679 | }) | 679 | }) |
680 | 680 | ||
681 | searchWorker.onmessage = function (e) { | 681 | searchWorker.onmessage = function (e) { |
682 | - | 682 | + |
683 | //console.log('callback searchWorker , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")); | 683 | //console.log('callback searchWorker , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")); |
684 | $rootScope.TermNumberData = e.data.TermNumberData; | 684 | $rootScope.TermNumberData = e.data.TermNumberData; |
685 | $rootScope.VocabTermData = e.data.VocabTermData,//same | 685 | $rootScope.VocabTermData = e.data.VocabTermData,//same |
686 | $scope.vocabTermTxt = e.data.vocabTermTxt, | 686 | $scope.vocabTermTxt = e.data.vocabTermTxt, |
687 | $scope.vocabLanguage = e.data.language, | 687 | $scope.vocabLanguage = e.data.language, |
688 | $rootScope.vocabTermDataArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt }); | 688 | $rootScope.vocabTermDataArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt }); |
689 | - | 689 | + |
690 | for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) { | 690 | for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) { |
691 | 691 | ||
692 | - | 692 | + |
693 | $rootScope.vocabTermDataArray[i].vocabTermTxt = new jinqJs() | 693 | $rootScope.vocabTermDataArray[i].vocabTermTxt = new jinqJs() |
694 | .from($rootScope.vocabTermDataArray[i].vocabTermTxt) | 694 | .from($rootScope.vocabTermDataArray[i].vocabTermTxt) |
695 | .distinct('_TermText', '_ActualTermNumber') | 695 | .distinct('_TermText', '_ActualTermNumber') |
696 | .orderBy([{ field: '_TermText', sort: 'asc' }]) | 696 | .orderBy([{ field: '_TermText', sort: 'asc' }]) |
697 | .select('_ActualTermNumber', '_TermText', '_cdId'); | 697 | .select('_ActualTermNumber', '_TermText', '_cdId'); |
698 | 698 | ||
699 | - // console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermDataArray[i].vocabTermTxt[0]._TermText); | 699 | + // console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermDataArray[i].vocabTermTxt[0]._TermText); |
700 | 700 | ||
701 | } | 701 | } |
702 | 702 | ||
703 | 703 | ||
704 | if ($rootScope.vocabTermDataArray.length == $rootScope.lexiconLanguageArray.length) { | 704 | if ($rootScope.vocabTermDataArray.length == $rootScope.lexiconLanguageArray.length) { |
705 | - $("#setting-spinner").css("display", "none"); | ||
706 | - // $rootScope.isLoading = false; | ||
707 | - // $("#spinner").css("visibility", "hidden"); | ||
708 | - // // $("#spinner").css("display", "none"); | 705 | + $("#setting-spinner").css("display", "none"); |
706 | + // $rootScope.isLoading = false; | ||
707 | + // $("#spinner").css("visibility", "hidden"); | ||
708 | + // // $("#spinner").css("display", "none"); | ||
709 | 709 | ||
710 | - //} else { | ||
711 | - // $rootScope.isLoading = true; | ||
712 | - // $("#spinner").css("visibility", "visible"); | ||
713 | - // // $("#spinner").css("visibility", "block"); | 710 | + //} else { |
711 | + // $rootScope.isLoading = true; | ||
712 | + // $("#spinner").css("visibility", "visible"); | ||
713 | + // // $("#spinner").css("visibility", "block"); | ||
714 | } | 714 | } |
715 | 715 | ||
716 | 716 | ||
@@ -731,7 +731,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -731,7 +731,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
731 | } | 731 | } |
732 | 732 | ||
733 | 733 | ||
734 | - | 734 | + |
735 | 735 | ||
736 | 736 | ||
737 | } | 737 | } |
@@ -1034,7 +1034,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1034,7 +1034,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1034 | 1034 | ||
1035 | //2.Draw mirror image | 1035 | //2.Draw mirror image |
1036 | $scope.DrawMirroredImage(Math.round(rectangle.scaledHeight), Math.round(rectangle.scaledWidth), Math.round(rectangle.scaledX), Math.round(rectangle.scaledY), src, value._BodyRegionId, 'N'); | 1036 | $scope.DrawMirroredImage(Math.round(rectangle.scaledHeight), Math.round(rectangle.scaledWidth), Math.round(rectangle.scaledX), Math.round(rectangle.scaledY), src, value._BodyRegionId, 'N'); |
1037 | - | 1037 | + |
1038 | $rootScope.BodyRegionCordinatesData.push( | 1038 | $rootScope.BodyRegionCordinatesData.push( |
1039 | { | 1039 | { |
1040 | "bodyRegionId": value._BodyRegionId, "Height": Math.round(rectangle.scaledHeight), "Width": Math.round(rectangle.scaledWidth), | 1040 | "bodyRegionId": value._BodyRegionId, "Height": Math.round(rectangle.scaledHeight), "Width": Math.round(rectangle.scaledWidth), |
@@ -1044,7 +1044,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1044,7 +1044,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1044 | 1044 | ||
1045 | //3.GetMaskImageSource | 1045 | //3.GetMaskImageSource |
1046 | var maskImageSrc = $scope.GetMaskImageSource($scope.imageSource); | 1046 | var maskImageSrc = $scope.GetMaskImageSource($scope.imageSource); |
1047 | - | 1047 | + |
1048 | //4 Draw Mask Mirror Image | 1048 | //4 Draw Mask Mirror Image |
1049 | $scope.DrawMirroredImage(Math.round(rectangle.scaledHeight), Math.round(rectangle.scaledWidth), Math.round(rectangle.scaledX), Math.round(rectangle.scaledY), maskImageSrc, value._BodyRegionId, 'Y'); | 1049 | $scope.DrawMirroredImage(Math.round(rectangle.scaledHeight), Math.round(rectangle.scaledWidth), Math.round(rectangle.scaledX), Math.round(rectangle.scaledY), maskImageSrc, value._BodyRegionId, 'Y'); |
1050 | 1050 | ||
@@ -1179,7 +1179,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1179,7 +1179,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1179 | } | 1179 | } |
1180 | } | 1180 | } |
1181 | //set scrollbars on canvas and hide loading label | 1181 | //set scrollbars on canvas and hide loading label |
1182 | - | 1182 | + |
1183 | // var isiOSSafari = (navigator.userAgent.match(/like Mac OS X/i)) ? true : false; | 1183 | // var isiOSSafari = (navigator.userAgent.match(/like Mac OS X/i)) ? true : false; |
1184 | var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false; | 1184 | var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false; |
1185 | 1185 | ||
@@ -1200,7 +1200,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1200,7 +1200,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1200 | // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition) | 1200 | // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition) |
1201 | $('#canvasDiv').scrollTop(50) | 1201 | $('#canvasDiv').scrollTop(50) |
1202 | var abc = $rootScope.BodyRegionCordinatesData; | 1202 | var abc = $rootScope.BodyRegionCordinatesData; |
1203 | - | 1203 | + |
1204 | $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); | 1204 | $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); |
1205 | // $('#spinner').css('visibility', 'hidden'); | 1205 | // $('#spinner').css('visibility', 'hidden'); |
1206 | $rootScope.isLoading = false; | 1206 | $rootScope.isLoading = false; |
@@ -1611,7 +1611,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1611,7 +1611,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1611 | 1611 | ||
1612 | $scope.MultiLanguageAnnationArray = []; | 1612 | $scope.MultiLanguageAnnationArray = []; |
1613 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { | 1613 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { |
1614 | - | 1614 | + |
1615 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); | 1615 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); |
1616 | } | 1616 | } |
1617 | 1617 | ||
@@ -1631,7 +1631,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1631,7 +1631,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1631 | // alert(annotationText); | 1631 | // alert(annotationText); |
1632 | $scope.MultiLanguageAnnationArray = []; | 1632 | $scope.MultiLanguageAnnationArray = []; |
1633 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { | 1633 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { |
1634 | - | 1634 | + |
1635 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); | 1635 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); |
1636 | } | 1636 | } |
1637 | 1637 | ||
@@ -1643,7 +1643,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1643,7 +1643,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1643 | // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); | 1643 | // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); |
1644 | $scope.MultiLanguageAnnationArray = []; | 1644 | $scope.MultiLanguageAnnationArray = []; |
1645 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { | 1645 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { |
1646 | - | 1646 | + |
1647 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); | 1647 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); |
1648 | } | 1648 | } |
1649 | 1649 | ||
@@ -1698,19 +1698,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1698,19 +1698,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1698 | var totalCanvas; | 1698 | var totalCanvas; |
1699 | if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { | 1699 | if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { |
1700 | totalCanvas = 9; | 1700 | totalCanvas = 9; |
1701 | - | 1701 | + |
1702 | } | 1702 | } |
1703 | else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) { | 1703 | else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) { |
1704 | totalCanvas = 5; | 1704 | totalCanvas = 5; |
1705 | - | 1705 | + |
1706 | } | 1706 | } |
1707 | else if (($rootScope.viewOrientationId == '5')) { | 1707 | else if (($rootScope.viewOrientationId == '5')) { |
1708 | totalCanvas = 4; | 1708 | totalCanvas = 4; |
1709 | - | 1709 | + |
1710 | } | 1710 | } |
1711 | else if (($rootScope.viewOrientationId == '6')) { | 1711 | else if (($rootScope.viewOrientationId == '6')) { |
1712 | totalCanvas = 1; | 1712 | totalCanvas = 1; |
1713 | - | 1713 | + |
1714 | } | 1714 | } |
1715 | 1715 | ||
1716 | if ($scope.ColoredImageSRC.length < totalCanvas) { | 1716 | if ($scope.ColoredImageSRC.length < totalCanvas) { |
@@ -1866,7 +1866,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1866,7 +1866,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1866 | 1866 | ||
1867 | imgCanvas.addEventListener('click', function (evt) { | 1867 | imgCanvas.addEventListener('click', function (evt) { |
1868 | 1868 | ||
1869 | - | 1869 | + |
1870 | if ($scope.isLayerChange == true) { | 1870 | if ($scope.isLayerChange == true) { |
1871 | $scope.isLayerChange = false; | 1871 | $scope.isLayerChange = false; |
1872 | } | 1872 | } |
@@ -2015,7 +2015,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2015,7 +2015,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2015 | // alert(annotationText); | 2015 | // alert(annotationText); |
2016 | $scope.MultiLanguageAnnationArray = []; | 2016 | $scope.MultiLanguageAnnationArray = []; |
2017 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { | 2017 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { |
2018 | - | 2018 | + |
2019 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); | 2019 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); |
2020 | } | 2020 | } |
2021 | 2021 | ||
@@ -2041,7 +2041,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2041,7 +2041,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2041 | 2041 | ||
2042 | 2042 | ||
2043 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { | 2043 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { |
2044 | - | 2044 | + |
2045 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); | 2045 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); |
2046 | } | 2046 | } |
2047 | 2047 | ||
@@ -2053,7 +2053,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2053,7 +2053,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2053 | else { | 2053 | else { |
2054 | $scope.MultiLanguageAnnationArray = []; | 2054 | $scope.MultiLanguageAnnationArray = []; |
2055 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { | 2055 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { |
2056 | - | 2056 | + |
2057 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); | 2057 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); |
2058 | } | 2058 | } |
2059 | 2059 | ||
@@ -2103,21 +2103,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2103,21 +2103,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2103 | var totalCanvas; | 2103 | var totalCanvas; |
2104 | if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { | 2104 | if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { |
2105 | totalCanvas = 9; | 2105 | totalCanvas = 9; |
2106 | - | 2106 | + |
2107 | } | 2107 | } |
2108 | else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) { | 2108 | else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) { |
2109 | totalCanvas = 5; | 2109 | totalCanvas = 5; |
2110 | - | 2110 | + |
2111 | } | 2111 | } |
2112 | else if (($rootScope.viewOrientationId == '5')) { | 2112 | else if (($rootScope.viewOrientationId == '5')) { |
2113 | totalCanvas = 4; | 2113 | totalCanvas = 4; |
2114 | - | 2114 | + |
2115 | } | 2115 | } |
2116 | else if (($rootScope.viewOrientationId == '6')) { | 2116 | else if (($rootScope.viewOrientationId == '6')) { |
2117 | totalCanvas = 1; | 2117 | totalCanvas = 1; |
2118 | } | 2118 | } |
2119 | - | ||
2120 | - if ($scope.ColoredImageSRC.length < totalCanvas) { | 2119 | + |
2120 | + if ($scope.ColoredImageSRC.length < totalCanvas) { | ||
2121 | $scope.ColoredImageSRC.push( | 2121 | $scope.ColoredImageSRC.push( |
2122 | { | 2122 | { |
2123 | "bodyRegionId": bodyRegionId, "SRC": src, | 2123 | "bodyRegionId": bodyRegionId, "SRC": src, |
@@ -2495,7 +2495,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2495,7 +2495,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2495 | 2495 | ||
2496 | // $timeout(function () { $scope.DisableProgressBar() }, 1000); | 2496 | // $timeout(function () { $scope.DisableProgressBar() }, 1000); |
2497 | 2497 | ||
2498 | - | 2498 | + |
2499 | 2499 | ||
2500 | 2500 | ||
2501 | }; | 2501 | }; |
@@ -2843,7 +2843,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2843,7 +2843,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2843 | 2843 | ||
2844 | //get annotation from term number | 2844 | //get annotation from term number |
2845 | $scope.GetAnnotationText = function (termNumber) { | 2845 | $scope.GetAnnotationText = function (termNumber) { |
2846 | - | 2846 | + |
2847 | $rootScope.annotationText = []; | 2847 | $rootScope.annotationText = []; |
2848 | var annotationText; | 2848 | var annotationText; |
2849 | var annotation = []; | 2849 | var annotation = []; |
@@ -3092,7 +3092,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3092,7 +3092,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3092 | 3092 | ||
3093 | //$scope.isMousUp(); | 3093 | //$scope.isMousUp(); |
3094 | 3094 | ||
3095 | - | 3095 | + |
3096 | 3096 | ||
3097 | $rootScope.isLoading = true; | 3097 | $rootScope.isLoading = true; |
3098 | $('#spinner').css('visibility', 'visible'); | 3098 | $('#spinner').css('visibility', 'visible'); |
@@ -3197,7 +3197,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3197,7 +3197,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3197 | $rootScope.isLoading = false; | 3197 | $rootScope.isLoading = false; |
3198 | $('#spinner').css('visibility', 'hidden'); | 3198 | $('#spinner').css('visibility', 'hidden'); |
3199 | 3199 | ||
3200 | - | 3200 | + |
3201 | } | 3201 | } |
3202 | 3202 | ||
3203 | 3203 | ||
@@ -3225,16 +3225,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3225,16 +3225,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3225 | 3225 | ||
3226 | 3226 | ||
3227 | 3227 | ||
3228 | - $scope.createDynamicSpeechBubble = function (event, x, y, isAnnotationNotForTBox) { | ||
3229 | - | ||
3230 | - | 3228 | + $scope.createDynamicSpeechBubble = function (event, x, y, isAnnotationForTBox) { |
3229 | + | ||
3230 | + | ||
3231 | + if (isAnnotationForTBox == true) { | ||
3231 | $scope.longestAnnotation = $scope.MultiLanguageAnnationArray.reduce(function (firstAnnotation, seconAnnotation) { return firstAnnotation.length > seconAnnotation.length ? firstAnnotation : seconAnnotation; }); | 3232 | $scope.longestAnnotation = $scope.MultiLanguageAnnationArray.reduce(function (firstAnnotation, seconAnnotation) { return firstAnnotation.length > seconAnnotation.length ? firstAnnotation : seconAnnotation; }); |
3232 | 3233 | ||
3233 | //1. In transparency box we shows two annotation at a time, so we need to decide the max length of annotation in btween two annotation because based on that | 3234 | //1. In transparency box we shows two annotation at a time, so we need to decide the max length of annotation in btween two annotation because based on that |
3234 | // we decide the size of speech bubble | 3235 | // we decide the size of speech bubble |
3235 | //2. | 3236 | //2. |
3236 | - | ||
3237 | - if (event.ctrlKey) { | 3237 | + |
3238 | + if (event.ctrlKey) { | ||
3238 | console.log('ctrl pressed'); | 3239 | console.log('ctrl pressed'); |
3239 | $scope.multiAnnotationIsON = true; | 3240 | $scope.multiAnnotationIsON = true; |
3240 | //2.1 create unique speech bubbles | 3241 | //2.1 create unique speech bubbles |
@@ -3637,7 +3638,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3637,7 +3638,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3637 | + '<div style="position:absolute;border:1px solid #000;display:none;z-index:59000;" id="bord_annotation">' | 3638 | + '<div style="position:absolute;border:1px solid #000;display:none;z-index:59000;" id="bord_annotation">' |
3638 | + '</div>'; | 3639 | + '</div>'; |
3639 | $("#sppeachBubble_annotation").css("height", "auto"); | 3640 | $("#sppeachBubble_annotation").css("height", "auto"); |
3640 | - | 3641 | + |
3641 | if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) { | 3642 | if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) { |
3642 | $("#sppeachBubble_annotation p").remove(); | 3643 | $("#sppeachBubble_annotation p").remove(); |
3643 | $('#canvasDiv').append(sppechBubbleDotHTML_annotation); | 3644 | $('#canvasDiv').append(sppechBubbleDotHTML_annotation); |
@@ -3758,7 +3759,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3758,7 +3759,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3758 | } | 3759 | } |
3759 | 3760 | ||
3760 | function myFunction(crossId) { | 3761 | function myFunction(crossId) { |
3761 | - | 3762 | + |
3762 | $('#' + crossId).parent().parent().parent().css("display", "none"); | 3763 | $('#' + crossId).parent().parent().parent().css("display", "none"); |
3763 | 3764 | ||
3764 | } | 3765 | } |
@@ -3834,7 +3835,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3834,7 +3835,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3834 | 3835 | ||
3835 | 3836 | ||
3836 | 3837 | ||
3837 | - | 3838 | + |
3838 | $('#btnTranparency').addClass('tButtonActive'); | 3839 | $('#btnTranparency').addClass('tButtonActive'); |
3839 | $('#btnIdentity').removeClass(' btn-primary'); | 3840 | $('#btnIdentity').removeClass(' btn-primary'); |
3840 | $('#btnIdentity').addClass('btn-black'); | 3841 | $('#btnIdentity').addClass('btn-black'); |
@@ -3961,7 +3962,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3961,7 +3962,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3961 | 3962 | ||
3962 | 3963 | ||
3963 | function mouseUpListener(e) { | 3964 | function mouseUpListener(e) { |
3964 | - | 3965 | + |
3965 | $scope.isTBDrawnOnBodyRegion = false; | 3966 | $scope.isTBDrawnOnBodyRegion = false; |
3966 | 3967 | ||
3967 | $(".com").remove(); | 3968 | $(".com").remove(); |
@@ -4482,7 +4483,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -4482,7 +4483,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
4482 | var tempCtx = transparencyTempCanvas.getContext('2d'); | 4483 | var tempCtx = transparencyTempCanvas.getContext('2d'); |
4483 | 4484 | ||
4484 | if (IsMirror == 'Yes') { | 4485 | if (IsMirror == 'Yes') { |
4485 | - | 4486 | + |
4486 | tempCtx.save(); | 4487 | tempCtx.save(); |
4487 | tempCtx.translate(Width, 0); | 4488 | tempCtx.translate(Width, 0); |
4488 | tempCtx.scale(-1, 1); | 4489 | tempCtx.scale(-1, 1); |
@@ -4547,11 +4548,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -4547,11 +4548,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
4547 | var tranparencyMaskImgSrc = $scope.GetMaskImageSource(tranparencyImgSrc); | 4548 | var tranparencyMaskImgSrc = $scope.GetMaskImageSource(tranparencyImgSrc); |
4548 | tempMaskImg.src = tranparencyMaskImgSrc;//"http://localhost/AIA/" + tranparencyMaskImgSrc; | 4549 | tempMaskImg.src = tranparencyMaskImgSrc;//"http://localhost/AIA/" + tranparencyMaskImgSrc; |
4549 | tempMaskImg.onload = function () { | 4550 | tempMaskImg.onload = function () { |
4550 | - | 4551 | + |
4551 | var tempmaskCtx = transparencyTempcanavsMask.getContext('2d'); | 4552 | var tempmaskCtx = transparencyTempcanavsMask.getContext('2d'); |
4552 | 4553 | ||
4553 | if (IsMirror == 'Yes') { | 4554 | if (IsMirror == 'Yes') { |
4554 | - | 4555 | + |
4555 | tempmaskCtx.save(); | 4556 | tempmaskCtx.save(); |
4556 | tempmaskCtx.translate(Width, 0); | 4557 | tempmaskCtx.translate(Width, 0); |
4557 | tempmaskCtx.scale(-1, 1); | 4558 | tempmaskCtx.scale(-1, 1); |
@@ -5066,7 +5067,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5066,7 +5067,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5066 | // alert(annotationText); | 5067 | // alert(annotationText); |
5067 | $scope.MultiLanguageAnnationArray = []; | 5068 | $scope.MultiLanguageAnnationArray = []; |
5068 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { | 5069 | for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { |
5069 | - | 5070 | + |
5070 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); | 5071 | $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); |
5071 | } | 5072 | } |
5072 | if (annotationText == "undefined") { | 5073 | if (annotationText == "undefined") { |
@@ -5310,8 +5311,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5310,8 +5311,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5310 | 5311 | ||
5311 | 5312 | ||
5312 | function TransparencyCanvasClickListener(evt) { | 5313 | function TransparencyCanvasClickListener(evt) { |
5313 | - // alert('tb clicked'); | ||
5314 | - | 5314 | + // alert('tb clicked'); |
5315 | + | ||
5315 | var pixelData; | 5316 | var pixelData; |
5316 | var pixelDataTrans; | 5317 | var pixelDataTrans; |
5317 | var mousePos = $scope.getMousePos(evt); | 5318 | var mousePos = $scope.getMousePos(evt); |
@@ -5486,7 +5487,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5486,7 +5487,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5486 | } | 5487 | } |
5487 | //$scope.annotationTextArrayT1.push(annotations.annotationT1); | 5488 | //$scope.annotationTextArrayT1.push(annotations.annotationT1); |
5488 | // $scope.annotationTextArrayT2.push(annotations.annotationT2); | 5489 | // $scope.annotationTextArrayT2.push(annotations.annotationT2); |
5489 | - | 5490 | + |
5490 | $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); | 5491 | $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); |
5491 | } | 5492 | } |
5492 | else | 5493 | else |
@@ -5503,7 +5504,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5503,7 +5504,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5503 | } | 5504 | } |
5504 | //$scope.annotationTextArrayT1.push(annotations.annotationT1); | 5505 | //$scope.annotationTextArrayT1.push(annotations.annotationT1); |
5505 | // $scope.annotationTextArrayT2.push(annotations.annotationT2); | 5506 | // $scope.annotationTextArrayT2.push(annotations.annotationT2); |
5506 | - | 5507 | + |
5507 | $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); | 5508 | $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); |
5508 | } | 5509 | } |
5509 | 5510 | ||
@@ -5521,7 +5522,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5521,7 +5522,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5521 | var tCanvasWidthAftrSplit = tCanvasWidth.split("p"); | 5522 | var tCanvasWidthAftrSplit = tCanvasWidth.split("p"); |
5522 | var tCanvasHeight = $(".ui-wrapper").css("height"); | 5523 | var tCanvasHeight = $(".ui-wrapper").css("height"); |
5523 | var tCanvasHeightAftrSplit = tCanvasHeight.split("p"); | 5524 | var tCanvasHeightAftrSplit = tCanvasHeight.split("p"); |
5524 | - // alert("modesty"); | 5525 | + // alert("modesty"); |
5525 | var tCanvasTotalWidth = parseInt(tCanvasLeftAftrSplit[0]) + parseInt(tCanvasWidthAftrSplit[0]); | 5526 | var tCanvasTotalWidth = parseInt(tCanvasLeftAftrSplit[0]) + parseInt(tCanvasWidthAftrSplit[0]); |
5526 | var tCanvasTotalHeight = parseInt(tCanvasTopAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]); | 5527 | var tCanvasTotalHeight = parseInt(tCanvasTopAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]); |
5527 | var mousePos = $scope.getMousePos(evt); | 5528 | var mousePos = $scope.getMousePos(evt); |
@@ -5588,11 +5589,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5588,11 +5589,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5588 | $scope.annotationTextArrayT1 = []; | 5589 | $scope.annotationTextArrayT1 = []; |
5589 | $scope.annotationTextArrayT2 = []; | 5590 | $scope.annotationTextArrayT2 = []; |
5590 | for (var i = 0; i <= annotations.annotationT1.length - 1; i++) { | 5591 | for (var i = 0; i <= annotations.annotationT1.length - 1; i++) { |
5591 | - $scope.annotationTextArrayT1.push(annotations.annotationT1[i]); | 5592 | + $scope.annotationTextArrayT1.push(annotations.annotationT1[i]); |
5592 | 5593 | ||
5593 | } | 5594 | } |
5594 | for (var i = 0; i <= annotations.annotationT2.length - 1; i++) { | 5595 | for (var i = 0; i <= annotations.annotationT2.length - 1; i++) { |
5595 | - $scope.annotationTextArrayT2.push(annotations.annotationT2[i]); | 5596 | + $scope.annotationTextArrayT2.push(annotations.annotationT2[i]); |
5596 | } | 5597 | } |
5597 | //$scope.annotationTextArrayT1.push(annotations.annotationT1); | 5598 | //$scope.annotationTextArrayT1.push(annotations.annotationT1); |
5598 | // $scope.annotationTextArrayT2.push(annotations.annotationT2); | 5599 | // $scope.annotationTextArrayT2.push(annotations.annotationT2); |
@@ -5613,15 +5614,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5613,15 +5614,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5613 | var tCanvasHeightAftrSplit = tCanvasHeight.split("p"); | 5614 | var tCanvasHeightAftrSplit = tCanvasHeight.split("p"); |
5614 | var tCanvasAttr = parseInt(tCanvasTopPosAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]); | 5615 | var tCanvasAttr = parseInt(tCanvasTopPosAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]); |
5615 | 5616 | ||
5616 | - // if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) <= tCanvasAttr) { | ||
5617 | - $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); | 5617 | + // if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) <= tCanvasAttr) { |
5618 | + $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); | ||
5618 | //} | 5619 | //} |
5619 | //else { | 5620 | //else { |
5620 | // $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt); | 5621 | // $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt); |
5621 | //} | 5622 | //} |
5622 | } | 5623 | } |
5623 | - else | ||
5624 | - { | 5624 | + else { |
5625 | $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt); | 5625 | $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt); |
5626 | } | 5626 | } |
5627 | } | 5627 | } |
@@ -5651,7 +5651,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5651,7 +5651,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5651 | //trans layer image data | 5651 | //trans layer image data |
5652 | var pixelDataTrans = maskCanvasContexttrans.getImageData(imgX, imgY, 1, 1); | 5652 | var pixelDataTrans = maskCanvasContexttrans.getImageData(imgX, imgY, 1, 1); |
5653 | // console.log('at the time' + pixelData.data[0]) | 5653 | // console.log('at the time' + pixelData.data[0]) |
5654 | - | 5654 | + |
5655 | var annotations = $scope.getAnnotationForTransparencyBox(pixelData, pixelDataTrans, $scope); | 5655 | var annotations = $scope.getAnnotationForTransparencyBox(pixelData, pixelDataTrans, $scope); |
5656 | if ($('#speechBubble').length > 0) | 5656 | if ($('#speechBubble').length > 0) |
5657 | $('#speechBubble').remove(); | 5657 | $('#speechBubble').remove(); |
@@ -5917,7 +5917,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5917,7 +5917,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5917 | //var txtTransparencyChange = document.getElementById("txtTransparencyChange"); | 5917 | //var txtTransparencyChange = document.getElementById("txtTransparencyChange"); |
5918 | //txtTransparencyChange.value = 0; | 5918 | //txtTransparencyChange.value = 0; |
5919 | // document.getElementById('txtLayerNumber').value = 0; | 5919 | // document.getElementById('txtLayerNumber').value = 0; |
5920 | - | 5920 | + |
5921 | 5921 | ||
5922 | 5922 | ||
5923 | $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber)); | 5923 | $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber)); |
@@ -6100,14 +6100,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6100,14 +6100,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6100 | $rootScope.isNormalMode = false; | 6100 | $rootScope.isNormalMode = false; |
6101 | $rootScope.isGenderChnage = false; | 6101 | $rootScope.isGenderChnage = false; |
6102 | $rootScope.isViewChange = false; | 6102 | $rootScope.isViewChange = false; |
6103 | - | 6103 | + |
6104 | //if listanager is visisble then close it | 6104 | //if listanager is visisble then close it |
6105 | 6105 | ||
6106 | $rootScope.CloseListManager(); | 6106 | $rootScope.CloseListManager(); |
6107 | 6107 | ||
6108 | $rootScope.isHighlightBodyByBodySystem = false; | 6108 | $rootScope.isHighlightBodyByBodySystem = false; |
6109 | 6109 | ||
6110 | - | 6110 | + |
6111 | $('#sppeachBubble').css('display', 'none'); | 6111 | $('#sppeachBubble').css('display', 'none'); |
6112 | 6112 | ||
6113 | $("#dot").css("display", "none"); | 6113 | $("#dot").css("display", "none"); |
@@ -6363,7 +6363,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6363,7 +6363,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6363 | 6363 | ||
6364 | } | 6364 | } |
6365 | else { | 6365 | else { |
6366 | - | 6366 | + |
6367 | //1. | 6367 | //1. |
6368 | $scope.flushCanvas(); | 6368 | $scope.flushCanvas(); |
6369 | 6369 | ||
@@ -6388,7 +6388,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6388,7 +6388,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6388 | 6388 | ||
6389 | //7. | 6389 | //7. |
6390 | 6390 | ||
6391 | - // $scope.layerNumber = $('#txtlayerNumber').val(); | 6391 | + // $scope.layerNumber = $('#txtlayerNumber').val(); |
6392 | $scope.CalculateImageCordinates($rootScope.viewOrientationId); | 6392 | $scope.CalculateImageCordinates($rootScope.viewOrientationId); |
6393 | // alert($rootScope.viewOrientationId + "gadash") | 6393 | // alert($rootScope.viewOrientationId + "gadash") |
6394 | 6394 | ||
@@ -7184,7 +7184,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7184,7 +7184,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7184 | DataService.getJson(layerJsonPath) | 7184 | DataService.getJson(layerJsonPath) |
7185 | .then( | 7185 | .then( |
7186 | function (result) { | 7186 | function (result) { |
7187 | - | 7187 | + |
7188 | 7188 | ||
7189 | $rootScope.BodyLayerData = result; | 7189 | $rootScope.BodyLayerData = result; |
7190 | 7190 | ||
@@ -7229,10 +7229,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7229,10 +7229,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7229 | else { | 7229 | else { |
7230 | 7230 | ||
7231 | $scope.CalculateImageCordinates($rootScope.viewOrientationId); | 7231 | $scope.CalculateImageCordinates($rootScope.viewOrientationId); |
7232 | - | 7232 | + |
7233 | // $("#btnTranparency").remove("disabled"); | 7233 | // $("#btnTranparency").remove("disabled"); |
7234 | $('#txtlayerNumber').val($scope.layerNumber) | 7234 | $('#txtlayerNumber').val($scope.layerNumber) |
7235 | - | 7235 | + |
7236 | 7236 | ||
7237 | 7237 | ||
7238 | } | 7238 | } |
@@ -8125,7 +8125,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -8125,7 +8125,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
8125 | $("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); | 8125 | $("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); |
8126 | 8126 | ||
8127 | $scope.terminateCurrentlyRunningWPs(); | 8127 | $scope.terminateCurrentlyRunningWPs(); |
8128 | - | 8128 | + |
8129 | $rootScope.isListManagerSelected = true; | 8129 | $rootScope.isListManagerSelected = true; |
8130 | //--- | 8130 | //--- |
8131 | if ($rootScope.isListManagerSelected == true) { | 8131 | if ($rootScope.isListManagerSelected == true) { |
@@ -8345,7 +8345,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -8345,7 +8345,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
8345 | 8345 | ||
8346 | $scope.aligneCanvasWithTerm = function () { | 8346 | $scope.aligneCanvasWithTerm = function () { |
8347 | console.log('aligneCanvasWithTerm') | 8347 | console.log('aligneCanvasWithTerm') |
8348 | - | 8348 | + |
8349 | 8349 | ||
8350 | var newX = parseInt($scope.scaleValue($scope.termCoordinate.x, $rootScope.zoomInOut, DA[0].ZOOM_TERM_DATA)); | 8350 | var newX = parseInt($scope.scaleValue($scope.termCoordinate.x, $rootScope.zoomInOut, DA[0].ZOOM_TERM_DATA)); |
8351 | var newY = parseInt($scope.scaleValue($scope.termCoordinate.y, $rootScope.zoomInOut, DA[0].ZOOM_TERM_DATA)); | 8351 | var newY = parseInt($scope.scaleValue($scope.termCoordinate.y, $rootScope.zoomInOut, DA[0].ZOOM_TERM_DATA)); |
@@ -8823,4 +8823,3 @@ function onListManagerTermSelection(id, isTermListOptionClicked) { | @@ -8823,4 +8823,3 @@ function onListManagerTermSelection(id, isTermListOptionClicked) { | ||
8823 | }); | 8823 | }); |
8824 | 8824 | ||
8825 | } | 8825 | } |
8826 | - |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -526,71 +526,71 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -526,71 +526,71 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
526 | .where("_TermId == " + pinTermNumber) | 526 | .where("_TermId == " + pinTermNumber) |
527 | .select(); | 527 | .select(); |
528 | 528 | ||
529 | - | ||
530 | 529 | ||
531 | - //3. get termText info | ||
532 | - var promise = ModuleService.getTermTextForPin($scope.moduleName) | ||
533 | - .then( | ||
534 | - function (response) { | ||
535 | 530 | ||
536 | - $scope.TermInfo = response.data.Terms.Term; | 531 | + //3. get termText info |
532 | + var promise = ModuleService.getTermTextForPin($scope.moduleName) | ||
533 | + .then( | ||
534 | + function (response) { | ||
537 | 535 | ||
536 | + $scope.TermInfo = response.data.Terms.Term; | ||
538 | 537 | ||
539 | - var termTextdata = new jinqJs() | ||
540 | - .from($scope.TermInfo) | ||
541 | - .where("__ActualTermNumber == " + pinTermNumber) | ||
542 | - .select(); | ||
543 | 538 | ||
544 | - var termText = termTextdata[0].__TermText; | ||
545 | - $scope.MultiLanguageAnnationArray = []; | ||
546 | - $scope.MultiLanguageAnnationArray.push(termText); | ||
547 | - | ||
548 | - if (isCtrlPressed) { | 539 | + var termTextdata = new jinqJs() |
540 | + .from($scope.TermInfo) | ||
541 | + .where("__ActualTermNumber == " + pinTermNumber) | ||
542 | + .select(); | ||
549 | 543 | ||
550 | - } | ||
551 | - else { | ||
552 | - if (isPinClicked) { | ||
553 | - var existingSpeechBubble = $("div[id*='sppeachBubble']"); | ||
554 | - for (var i = 0; i < existingSpeechBubble.length; i++) { | ||
555 | - existingSpeechBubble[i].parentNode.removeChild(existingSpeechBubble[i]); | ||
556 | - | ||
557 | - //make all pin heads grey | ||
558 | - var radial = $('#aaDetailViewCanvas').createGradient({ | ||
559 | - x1: 50, y1: 50, | ||
560 | - x2: 50, y2: 50, | ||
561 | - r1: 10, r2: 30, | ||
562 | - c1: 'rgba(100, 50, 0,0)', | ||
563 | - c2: 'rgb(216, 216, 216)' | ||
564 | - }); | ||
565 | - | ||
566 | - | ||
567 | - $('#aaDetailViewCanvas').setLayers({ | ||
568 | - fillStyle: radial, | ||
569 | - }).drawLayers(); | ||
570 | - } | 544 | + var termText = termTextdata[0].__TermText; |
545 | + $scope.MultiLanguageAnnationArray = []; | ||
546 | + $scope.MultiLanguageAnnationArray.push(termText); | ||
571 | 547 | ||
572 | - var existingSpeechBubbleLine = $("div[id*='speechBubbleLine']"); | ||
573 | - for (var i = 0; i < existingSpeechBubbleLine.length; i++) { | ||
574 | - existingSpeechBubbleLine[i].parentNode.removeChild(existingSpeechBubbleLine[i]); | ||
575 | - } | ||
576 | - var speechBubbleDraggedLine = $("div[id*='speechBubbleDraggedLine']"); | ||
577 | - for (var i = 0; i < speechBubbleDraggedLine.length; i++) { | ||
578 | - speechBubbleDraggedLine[i].parentNode.removeChild(speechBubbleDraggedLine[i]); | 548 | + if (isCtrlPressed) { |
549 | + | ||
550 | + } | ||
551 | + else { | ||
552 | + if (isPinClicked) { | ||
553 | + var existingSpeechBubble = $("div[id*='sppeachBubble']"); | ||
554 | + for (var i = 0; i < existingSpeechBubble.length; i++) { | ||
555 | + existingSpeechBubble[i].parentNode.removeChild(existingSpeechBubble[i]); | ||
556 | + | ||
557 | + //make all pin heads grey | ||
558 | + var radial = $('#aaDetailViewCanvas').createGradient({ | ||
559 | + x1: 50, y1: 50, | ||
560 | + x2: 50, y2: 50, | ||
561 | + r1: 10, r2: 30, | ||
562 | + c1: 'rgba(100, 50, 0,0)', | ||
563 | + c2: 'rgb(216, 216, 216)' | ||
564 | + }); | ||
565 | + | ||
566 | + | ||
567 | + $('#aaDetailViewCanvas').setLayers({ | ||
568 | + fillStyle: radial, | ||
569 | + }).drawLayers(); | ||
570 | + } | ||
571 | + | ||
572 | + var existingSpeechBubbleLine = $("div[id*='speechBubbleLine']"); | ||
573 | + for (var i = 0; i < existingSpeechBubbleLine.length; i++) { | ||
574 | + existingSpeechBubbleLine[i].parentNode.removeChild(existingSpeechBubbleLine[i]); | ||
575 | + } | ||
576 | + var speechBubbleDraggedLine = $("div[id*='speechBubbleDraggedLine']"); | ||
577 | + for (var i = 0; i < speechBubbleDraggedLine.length; i++) { | ||
578 | + speechBubbleDraggedLine[i].parentNode.removeChild(speechBubbleDraggedLine[i]); | ||
579 | + } | ||
579 | } | 580 | } |
580 | } | 581 | } |
581 | - } | ||
582 | - if (pinDataWithFirstTermNumber.length > 1) { | ||
583 | - isSameTermWithMultiPin = true; | ||
584 | - } | ||
585 | - angular.forEach(pinDataWithFirstTermNumber, function (value, key) { | ||
586 | - $scope.selectedPin.push(value._PinId); | ||
587 | - var headX = (parseInt(value._HeadX)); | ||
588 | - var headY = (parseInt(value._HeadY)); | ||
589 | - $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin); | ||
590 | - }) | ||
591 | - | ||
592 | - }, | ||
593 | - function(error){}) | 582 | + if (pinDataWithFirstTermNumber.length > 1) { |
583 | + isSameTermWithMultiPin = true; | ||
584 | + } | ||
585 | + angular.forEach(pinDataWithFirstTermNumber, function (value, key) { | ||
586 | + $scope.selectedPin.push(value._PinId); | ||
587 | + var headX = (parseInt(value._HeadX)); | ||
588 | + var headY = (parseInt(value._HeadY)); | ||
589 | + $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin); | ||
590 | + }) | ||
591 | + | ||
592 | + }, | ||
593 | + function (error) { }) | ||
594 | } | 594 | } |
595 | 595 | ||
596 | $scope.ClearAllPins = function () { | 596 | $scope.ClearAllPins = function () { |
@@ -602,10 +602,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -602,10 +602,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
602 | }; | 602 | }; |
603 | 603 | ||
604 | $scope.createSpeechBubble = function (x, y, PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin) { | 604 | $scope.createSpeechBubble = function (x, y, PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin) { |
605 | - | 605 | + |
606 | $scope.longestAnnotation = $scope.MultiLanguageAnnationArray.reduce(function (firstAnnotation, seconAnnotation) { return firstAnnotation.length > seconAnnotation.length ? firstAnnotation : seconAnnotation; }); | 606 | $scope.longestAnnotation = $scope.MultiLanguageAnnationArray.reduce(function (firstAnnotation, seconAnnotation) { return firstAnnotation.length > seconAnnotation.length ? firstAnnotation : seconAnnotation; }); |
607 | 607 | ||
608 | - $scope.createSpeechBubbleBasedOnAnnotationLength(x, y, PinId); | 608 | + $scope.createSpeechBubbleBasedOnAnnotationLength(x, y, PinId); |
609 | 609 | ||
610 | $('#sppeachBubble').draggable( | 610 | $('#sppeachBubble').draggable( |
611 | { | 611 | { |
@@ -616,7 +616,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -616,7 +616,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
616 | $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#imageDiv').offset().left, evt.pageY + verticalScrollPosition - $('#imageDiv').offset().top, true); | 616 | $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#imageDiv').offset().left, evt.pageY + verticalScrollPosition - $('#imageDiv').offset().top, true); |
617 | }, | 617 | }, |
618 | }); | 618 | }); |
619 | - | 619 | + |
620 | } | 620 | } |
621 | 621 | ||
622 | $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo, language) { | 622 | $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo, language) { |
@@ -696,7 +696,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -696,7 +696,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
696 | } | 696 | } |
697 | 697 | ||
698 | 698 | ||
699 | - | 699 | + |
700 | $rootScope.Globe1 = []; | 700 | $rootScope.Globe1 = []; |
701 | $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, PinId) { | 701 | $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, PinId) { |
702 | 702 | ||
@@ -776,7 +776,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -776,7 +776,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
776 | } | 776 | } |
777 | } | 777 | } |
778 | var Globe = []; | 778 | var Globe = []; |
779 | - | 779 | + |
780 | $rootScope.Globe1.push({ "currentX": x, "currentY": y, "id": PinId }); | 780 | $rootScope.Globe1.push({ "currentX": x, "currentY": y, "id": PinId }); |
781 | Globe.push({ currentX: x, currentY: y }); | 781 | Globe.push({ currentX: x, currentY: y }); |
782 | document.getElementById('speechBubbleLine' + PinId + '').style.display = 'block'; | 782 | document.getElementById('speechBubbleLine' + PinId + '').style.display = 'block'; |
@@ -832,7 +832,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -832,7 +832,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
832 | }); | 832 | }); |
833 | 833 | ||
834 | 834 | ||
835 | - $('#aaDetailViewCanvas').setLayer(pinHeadName,{ | 835 | + $('#aaDetailViewCanvas').setLayer(pinHeadName, { |
836 | fillStyle: radial, | 836 | fillStyle: radial, |
837 | }).drawLayers(); | 837 | }).drawLayers(); |
838 | }); | 838 | }); |
@@ -847,7 +847,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -847,7 +847,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
847 | }); | 847 | }); |
848 | var pinHeadName = 'PinArc_' + PinId; | 848 | var pinHeadName = 'PinArc_' + PinId; |
849 | var pin = $('#aaDetailViewCanvas').getLayer(pinHeadName); | 849 | var pin = $('#aaDetailViewCanvas').getLayer(pinHeadName); |
850 | - // pin.fillStyle = radialAfterClick; | 850 | + // pin.fillStyle = radialAfterClick; |
851 | 851 | ||
852 | $('#aaDetailViewCanvas').setLayer(pinHeadName, { | 852 | $('#aaDetailViewCanvas').setLayer(pinHeadName, { |
853 | fillStyle: radialAfterClick, | 853 | fillStyle: radialAfterClick, |
@@ -880,7 +880,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -880,7 +880,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
880 | var f = cx; | 880 | var f = cx; |
881 | // alert(d); | 881 | // alert(d); |
882 | if (BoolValues == true) { | 882 | if (BoolValues == true) { |
883 | - $("#speechBubbleDraggedLine" + id).css({ 'display': 'block', 'width': d + 'px', 'top': (e-10) + 'px', 'left': (f-5) + 'px', 'transform': 'rotate(' + theta + 'deg)', '-moz-transform': 'rotate(' + theta + 'deg)', '-webkit-transform': 'rotate(' + theta + 'deg)', 'transform-origin': '0% 0%' }); | 883 | + $("#speechBubbleDraggedLine" + id).css({ 'display': 'block', 'width': d + 'px', 'top': (e - 10) + 'px', 'left': (f - 5) + 'px', 'transform': 'rotate(' + theta + 'deg)', '-moz-transform': 'rotate(' + theta + 'deg)', '-webkit-transform': 'rotate(' + theta + 'deg)', 'transform-origin': '0% 0%' }); |
884 | } | 884 | } |
885 | else { | 885 | else { |
886 | $("#bord_annotation").css({ 'display': 'block', 'width': d + 'px', 'top': e + 'px', 'left': f + 'px', 'transform': 'rotate(' + theta + 'deg)', '-moz-transform': 'rotate(' + theta + 'deg)', '-webkit-transform': 'rotate(' + theta + 'deg)', 'transform-origin': '0% 0%' }); | 886 | $("#bord_annotation").css({ 'display': 'block', 'width': d + 'px', 'top': e + 'px', 'left': f + 'px', 'transform': 'rotate(' + theta + 'deg)', '-moz-transform': 'rotate(' + theta + 'deg)', '-webkit-transform': 'rotate(' + theta + 'deg)', 'transform-origin': '0% 0%' }); |
@@ -919,9 +919,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -919,9 +919,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
919 | fillStyle: radial, | 919 | fillStyle: radial, |
920 | x: x, y: y, | 920 | x: x, y: y, |
921 | radius: 5, | 921 | radius: 5, |
922 | - | 922 | + |
923 | click: function (clickedPin) { | 923 | click: function (clickedPin) { |
924 | - | 924 | + |
925 | //change the head color to green | 925 | //change the head color to green |
926 | var radialAfterClick = $('#aaDetailViewCanvas').createGradient({ | 926 | var radialAfterClick = $('#aaDetailViewCanvas').createGradient({ |
927 | x1: 50, y1: 50, | 927 | x1: 50, y1: 50, |
@@ -942,7 +942,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -942,7 +942,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
942 | .where("_PinId == " + pinID) | 942 | .where("_PinId == " + pinID) |
943 | .select(); | 943 | .select(); |
944 | if (clickedPin.event.ctrlKey == true) { | 944 | if (clickedPin.event.ctrlKey == true) { |
945 | - $scope.showAnnotation(selectedPinData,true, true ); | 945 | + $scope.showAnnotation(selectedPinData, true, true); |
946 | 946 | ||
947 | } | 947 | } |
948 | else { | 948 | else { |
@@ -954,11 +954,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -954,11 +954,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
954 | // var pinHeadName = 'Arc_' + value; | 954 | // var pinHeadName = 'Arc_' + value; |
955 | // var pin = $('aaDetailViewCanvas').getLayer(pinHeadName); | 955 | // var pin = $('aaDetailViewCanvas').getLayer(pinHeadName); |
956 | // pin.fillStyle = radialAfterClick; | 956 | // pin.fillStyle = radialAfterClick; |
957 | - | ||
958 | 957 | ||
959 | - | 958 | + |
959 | + | ||
960 | //}) | 960 | //}) |
961 | - | 961 | + |
962 | } | 962 | } |
963 | 963 | ||
964 | }).drawLayers(); | 964 | }).drawLayers(); |
@@ -983,5 +983,5 @@ function showSelectedSystemPins(event) { | @@ -983,5 +983,5 @@ function showSelectedSystemPins(event) { | ||
983 | }); | 983 | }); |
984 | } | 984 | } |
985 | onCloseBtnClick = function (event) { | 985 | onCloseBtnClick = function (event) { |
986 | - alert('closed') | ||
987 | - } | 986 | + alert('closed') |
987 | +} | ||
988 | \ No newline at end of file | 988 | \ No newline at end of file |
400-SOURCECODE/AIAHTML5.Web/app/views/atlas-anatomy-detail.html
1 | -๏ปฟ | ||
2 | - <div class="container-fluid "> | ||
3 | - <!--Header--> | ||
4 | - <nav class="navbar navbar-inverse navbar-fixed-top"> | ||
5 | - <div class="container-fluid"> | ||
6 | - <!-- Brand and toggle get grouped for better mobile display --> | ||
7 | - <div class="navbar-header"> | ||
8 | - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topFixedNavbar1" aria-expanded="false"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button> | ||
9 | - <a class="frameLogo navbar-brand" href="welcome.html"><img src="img/logo-main.png" class="img-responsive" alt=""></a> | ||
10 | - </div> | ||
11 | - | ||
12 | - </div> | ||
13 | - </nav> | ||
14 | - <!--Body--> | ||
15 | - <div class="bodyWrap row"> | ||
16 | - <div class="col-sm-12 pageHeading"> | ||
17 | - <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>--> | ||
18 | - <!--<div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-exchange"></i> </div>--> | ||
19 | - <h4 class="pull-left">1<sup>st</sup> & 2<sup>nd</sup> Intercostal Spaces</h4> | ||
20 | - <div class="pull-right btn-group paddTop4 hidden-xs"> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div> | ||
21 | - <div class="clearfix"></div> | 1 | +๏ปฟ<div id="aaDetailPageDiv" class="bodyWrap row" ng-controller="TileViewListController"> |
2 | + | ||
3 | + <!--<div class="col-sm-12 pageHeading"> | ||
4 | + <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>--> | ||
5 | + <!--<div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-exchange"></i> </div>--> | ||
6 | + <!--<h4 class="pull-left">1<sup>st</sup> & 2<sup>nd</sup> Intercostal Spaces</h4>--> | ||
7 | + <!--<div class="pull-right btn-group paddTop4 hidden-xs"> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div> | ||
8 | + <div class="clearfix"></div>--> | ||
9 | + <!--</div>--> | ||
10 | + <div class="tools pull-left" style="top:44px;"> | ||
11 | + <div class="toggle-icon toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div> | ||
12 | + <div class=""> | ||
13 | + <div class="col-sm-6" title="Hide Pins"><button class="btn btn-black btn-sm" ng-click="alert('hi pin')"> <img src="../../../content/images/aa/LeftMenu/hide-pin.png" alt="" title=""></button> </div> | ||
14 | + <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt="" title=""></button></div> | ||
15 | + <div class="col-sm-6" title="Show All Pins in System(s)"><button class="btn btn-primary btn-sm marginTop5"><img src="../../../content/images/aa/LeftMenu/all-pin.png" alt="" title=""></button></div> | ||
16 | + <div class="col-sm-6" title="Select System"> | ||
17 | + <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="../../../content/images/aa/LeftMenu/icon-highlight.png" alt="" title=""></button> | ||
18 | + <ul class="dropdown-menu" aria-labelledby="dropdownMenu221"> | ||
19 | + <li><a href="#" title="Current Structure">All</a></li> | ||
20 | + <li role="separator" class="divider"></li> | ||
21 | + <li><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li> | ||
22 | + <li><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li> | ||
23 | + <li class="disabled"><a id="3" href="#" title="Endocrine" onclick="showSelectedSystemPins(event)">Endocrine</a></li> | ||
24 | + <li><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li> | ||
25 | + <li class="disabled"><a id="5" href="#" title="Integumentary" onclick="showSelectedSystemPins(event)">Integumentary</a></li> | ||
26 | + <li class="disabled"><a id="6" href="#" title="Lymphatic" onclick="showSelectedSystemPins(event)">Lymphatic</a></li> | ||
27 | + <li><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li> | ||
28 | + <li class="disabled"><a id="8" href="#" title="Nervous" onclick="showSelectedSystemPins(event)">Nervous</a></li> | ||
29 | + <li class="disabled"><a id="9" href="#" title="Reproductive" onclick="showSelectedSystemPins(event)">Reproductive</a></li> | ||
30 | + <li class="disabled"><a id="10" href="#" title="Respiratory" onclick="showSelectedSystemPins(event)">Respiratory</a></li> | ||
31 | + <li><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li> | ||
32 | + <li class="disabled"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li> | ||
33 | + </ul> | ||
34 | + | ||
22 | </div> | 35 | </div> |
23 | - <div class="tools pull-left" style="top:44px;"> | ||
24 | - <div class="toggle-icon toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div> | 36 | + <div class="col-sm-12" data-toggle="tooltip" data-placement="top" title="Show/Hide Structure Name Boxes"><button class="btn btn-black btn-sm marginTop5 btn-block"> <img src="../../../content/images/aa/LeftMenu/comment-box.png" alt="" title=""></button> </div> |
37 | + </div> | ||
38 | + <div class="pips-slider" style="margin-top:125px"> | ||
39 | + <h3>Zoom <i class="fa fa-search-plus"></i></h3> | ||
40 | + <div class="slider" id="vertical-slider"></div> | ||
41 | + </div> | ||
42 | + </div> | ||
43 | + | ||
44 | + <div class="main2"> | ||
45 | + <div class="col-sm-12 stickey-area"> | ||
46 | + <div class="breadcrumb"> | ||
25 | <div class=""> | 47 | <div class=""> |
26 | - <div class="col-sm-6" title="Hide Pins"><button class="btn btn-black btn-sm"> <img src="img/hide-pin.png" alt="" title=""></button> </div> | ||
27 | - <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right"><img src="img/draw-pin.png" alt="" title=""></button></div> | ||
28 | - <div class="col-sm-6" title="Show All Pins in System(s)"><button class="btn btn-primary btn-sm marginTop5"><img src="img/all-pin.png" alt="" title=""></button></div> | ||
29 | - <div class="col-sm-6" title="Select System"> | ||
30 | - <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="img/icon-highlight.png" alt="" title=""></button> | ||
31 | - <ul class="dropdown-menu" aria-labelledby="dropdownMenu221"> | ||
32 | - <li><a href="#" title="Current Structure">All</a></li> | 48 | + <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left"> |
49 | + <input class="form-control input-sm " type="text" placeholder="Anterior cutaneous branch of first intercostal nerve"> | ||
50 | + <!--<select class="form-control input-sm "> | ||
51 | + <option>---Select---</option> | ||
52 | + <option selected>Anterior cutaneous branch of first intercostal nerve</option> | ||
53 | + <option>Anterior cutaneous branch of second intercostal nerve</option> | ||
54 | + <option>Anterior cutaneous branch of third intercostal nerve</option> | ||
55 | + <option>Anterior intercostal artery</option> | ||
56 | + <option>Anterior intercostal vein</option> | ||
57 | + </select>--> | ||
58 | + <!--<div class="input-group-addon btn btn-primary btn-sm"></div>--> | ||
59 | + </div> | ||
60 | + | ||
61 | + <!-- Single button --> | ||
62 | + <div class="btn-group"> | ||
63 | + <button type="button" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
64 | + <i class="fa fa-arrow-circle-right"></i> | ||
65 | + </button> | ||
66 | + <ul class="dropdown-menu"> | ||
67 | + <li><a href="#">1<sup>st</sup> & 2<sup>nd</sup> Intercostal Spaces</a></li> | ||
33 | <li role="separator" class="divider"></li> | 68 | <li role="separator" class="divider"></li> |
34 | - <li><a href="#" title="Cardiovascular">Cardiovascular</a></li> | ||
35 | - <li><a href="#" title="Digestive">Digestive</a></li> | ||
36 | - <li class="disabled"><a href="#" title="Endocrine">Endocrine</a></li> | ||
37 | - <li class="disabled"><a href="#" title="Immune">Immune</a></li> | ||
38 | - <li class="disabled"><a href="#" title="Integumentary">Integumentary</a></li> | ||
39 | - <li class="disabled"><a href="#" title="Lymphatic">Lymphatic</a></li> | ||
40 | - <li><a href="#" title="Muscular">Muscular</a></li> | ||
41 | - <li class="disabled"><a href="#" title="Nervous">Nervous</a></li> | ||
42 | - <li class="disabled"><a href="#" title="Reproductive">Reproductive</a></li> | ||
43 | - <li class="disabled"><a href="#" title="Respiratory">Respiratory</a></li> | ||
44 | - <li><a href="#" title="Skeletal">Skeletal</a></li> | ||
45 | - <li class="disabled"><a href="#" title="Urinary">Urinary</a></li> | 69 | + <li><a href="#">All</a></li> |
46 | </ul> | 70 | </ul> |
47 | - | ||
48 | </div> | 71 | </div> |
49 | - <div class="col-sm-12" data-toggle="tooltip" data-placement="top" title="Show/Hide Structure Name Boxes"><button class="btn btn-black btn-sm marginTop5 btn-block"> <img src="img/comment-box.png" alt="" title=""></button> </div> | ||
50 | - </div> | ||
51 | - <div class="pips-slider" style="margin-top:125px"> | ||
52 | - <h3>Zoom <i class="fa fa-search-plus"></i></h3> | ||
53 | - <div class="slider" id="vertical-slider"></div> | 72 | + <div class="btn-group"> |
73 | + <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="navigatorMan" ng-click="alert('hi nav')"> | ||
74 | + <i class="fa fa-male"></i> | ||
75 | + </button> | ||
76 | + <ul class="dropdown-menu" style="min-width:auto;"> | ||
77 | + <li><img src="../../../content/images/aa/LeftMenu/position.jpg" class="img-responsive"></li> | ||
78 | + </ul> | ||
79 | + </div> | ||
80 | + | ||
54 | </div> | 81 | </div> |
55 | </div> | 82 | </div> |
83 | + </div> | ||
84 | + <!--<img id="scream" width="220" height="277" src="~/../../../content/images/noraml-pin.png" style="visibility:hidden" alt="The Scream">--> | ||
85 | + <!--<img src="../../../content/images/noraml-pin.png" style="visibility:hidden" id="normal-pin"/>--> | ||
86 | + <div class="col-sm-12"> | ||
87 | + <div class="container-fluid"> | ||
88 | + <div class="row"> | ||
56 | 89 | ||
57 | - <div class="main2"> | ||
58 | - <div class="col-sm-12 stickey-area"> | ||
59 | - <div class="breadcrumb"> | ||
60 | - <div class=""> | ||
61 | - <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left"> | ||
62 | - <input class="form-control input-sm " type="text" placeholder="Anterior cutaneous branch of first intercostal nerve"> | ||
63 | - <!--<select class="form-control input-sm "> | ||
64 | - <option>---Select---</option> | ||
65 | - <option selected>Anterior cutaneous branch of first intercostal nerve</option> | ||
66 | - <option>Anterior cutaneous branch of second intercostal nerve</option> | ||
67 | - <option>Anterior cutaneous branch of third intercostal nerve</option> | ||
68 | - <option>Anterior intercostal artery</option> | ||
69 | - <option>Anterior intercostal vein</option> | ||
70 | - </select>--> | ||
71 | - <!--<div class="input-group-addon btn btn-primary btn-sm"></div>--> | ||
72 | - </div> | ||
73 | - | ||
74 | - <!-- Single button --> | ||
75 | - <div class="btn-group"> | ||
76 | - <button type="button" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
77 | - <i class="fa fa-arrow-circle-right"></i> | ||
78 | - </button> | ||
79 | - <ul class="dropdown-menu"> | ||
80 | - <li><a href="#">1<sup>st</sup> & 2<sup>nd</sup> Intercostal Spaces</a></li> | ||
81 | - <li role="separator" class="divider"></li> | ||
82 | - <li><a href="#">All</a></li> | ||
83 | - </ul> | ||
84 | - </div> | ||
85 | - <div class="btn-group"> | ||
86 | - <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
87 | - <i class="fa fa-male"></i> | ||
88 | - </button> | ||
89 | - <ul class="dropdown-menu" style="min-width:auto;"> | ||
90 | - <li><img src="img/position.jpg" class="img-responsive"></li> | ||
91 | - </ul> | ||
92 | - </div> | ||
93 | - | ||
94 | - </div> | ||
95 | - </div> | ||
96 | - </div> | ||
97 | - <div class="col-sm-12"> | ||
98 | - <div class="container-fluid"> | ||
99 | - <div class="row"> | ||
100 | - <div class="col-sm-12 img-thumbnail" align="center"><img src="img/1000x600.jpg" alt="" title="" class="img-responsive"></div> | ||
101 | - <!--<div class="col-sm-1 img-thumbnail pull-right" align="center"><img src="img/500x300.jpg" alt="" title="" class="img-responsive"></div> | ||
102 | - <div class="clearfix"></div>--> | ||
103 | - </div> | 90 | + <div class=" col-sm-12 img-thumbnail" id="imageDiv" style="height: 478px; overflow: scroll;"> |
91 | + <img id="modItemImage" alt="" title="" style="left:0px;top:0px;position:absolute"> | ||
92 | + <!--<div class="clearfix"> | ||
93 | + <img id="modItemImage" ng-init="alert('hi')" alt="" title="" class="img-responsive"> | ||
94 | + </div> | ||
95 | + <!--<div class="col-sm-1 img-thumbnail pull-right" align="center"><img src="../../content/images/1000x600.jpg" alt="" title="" class="img-responsive"></div> | ||
96 | + <div class="clearfix"></div>--> | ||
104 | </div> | 97 | </div> |
105 | </div> | 98 | </div> |
106 | - <div class="clearfix"></div> | ||
107 | - | 99 | + </div> |
108 | 100 | ||
109 | 101 | ||
110 | - </div> | ||
111 | </div> | 102 | </div> |
112 | - </div> | ||
113 | 103 | ||
104 | + </div> | ||
105 | +</div> | ||
114 | 106 | ||
115 | - | ||
116 | - <script> | ||
117 | - $(window).load(function () { | ||
118 | - $(".stickey-area").sticky(); | ||
119 | - }); | ||
120 | - </script> | ||
121 | - <script> | ||
122 | - $(function () { | ||
123 | - $("#slider-range-min-2").slider({ | ||
124 | - range: "min", | ||
125 | - min: 1, | ||
126 | - max: 60, | ||
127 | - value: 10, | ||
128 | - slide: function (event, ui) { | ||
129 | - $("#amount-2").val(ui.value); | ||
130 | - } | ||
131 | - }); | ||
132 | - $("#amount-2").val($("#slider-vertical-2").slider("value")); | ||
133 | - | 107 | +<script> |
108 | + $(window).load(function () { | ||
109 | + $(".stickey-area").sticky(); | ||
110 | + }); | ||
111 | +</script> | ||
112 | +<script> | ||
113 | + $(function () { | ||
114 | + $("#slider-range-min-2").slider({ | ||
115 | + range: "min", | ||
116 | + min: 1, | ||
117 | + max: 60, | ||
118 | + value: 10, | ||
119 | + slide: function (event, ui) { | ||
120 | + $("#amount-2").val(ui.value); | ||
121 | + } | ||
134 | }); | 122 | }); |
135 | - </script> | 123 | + $("#amount-2").val($("#slider-vertical-2").slider("value")); |
136 | 124 | ||
137 | - <script> | ||
138 | - $(document).ready(function () { | ||
139 | - $('[data-toggle="tooltip"]').tooltip(); | ||
140 | - }); | ||
141 | - </script> | ||
142 | - <script src="js/jquery-ui-slider-pips.js"></script> | ||
143 | - <script> | ||
144 | - $(".slider") | 125 | + }); |
126 | +</script> | ||
145 | 127 | ||
146 | - .slider({ | ||
147 | - min: 25, | ||
148 | - max: 100, | ||
149 | - value: 100, | ||
150 | - range: "min", | ||
151 | - orientation: "vertical" | ||
152 | - }) | 128 | +<script> |
129 | + $(document).ready(function () { | ||
130 | + $('[data-toggle="tooltip"]').tooltip(); | ||
131 | + }); | ||
132 | +</script> | ||
133 | +<script src="js/jquery-ui-slider-pips.js"></script> | ||
134 | +<script> | ||
135 | + $(".slider") | ||
153 | 136 | ||
154 | - .slider("pips", { | ||
155 | - rest: "label", | ||
156 | - step: "15" | ||
157 | - }); | ||
158 | - </script> | 137 | + .slider({ |
138 | + min: 25, | ||
139 | + max: 100, | ||
140 | + value: 100, | ||
141 | + range: "min", | ||
142 | + orientation: "vertical" | ||
143 | + }) | ||
159 | 144 | ||
160 | - <script> | ||
161 | - $(function () { | ||
162 | - $("#draggable").draggable(); | ||
163 | - }); | ||
164 | - </script> | 145 | + .slider("pips", { |
146 | + rest: "label", | ||
147 | + step: "15" | ||
148 | + }); | ||
149 | +</script> | ||
165 | 150 | ||
151 | +<script> | ||
152 | + $(function () { | ||
153 | + $("#draggable").draggable(); | ||
154 | + }); | ||
155 | +</script> | ||
166 | 156 | ||
157 | +<script src="app/controllers/TileViewListController.js"></script> | ||
167 | \ No newline at end of file | 158 | \ No newline at end of file |