ADAM / AIAHTML5

Commit e25b7583c07402ab98a0bde92fcaa8c5badff09c

Authored by Nikita Kulshreshtha
1 parent fb0da0c8

speechbubble issue fix

Inline Side-by-side
Showing 2 changed files with 48 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @e25b758
... ... @@ -710,7 +710,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
710 710 });
711 711  
712 712 }
713   -
  713 + $scope.sliderVal = 100;
714 714 $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, PinId) {
715 715  
716 716 x = x * $scope.sliderPercentValue;
... ... @@ -796,11 +796,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
796 796 $rootScope.speechBubbleDimaensions.push({ "currentX": x, "currentY": y, "id": PinId });
797 797 speechBubbleDims.push({ currentX: x, currentY: y });
798 798 document.getElementById('speechBubbleLine' + PinId + '').style.display = 'block';
799   - document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 45 * $scope.sliderPercentValue)) + 'px';
800   - document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY) - 20 * $scope.sliderPercentValue) + 'px';
  799 + if ($scope.sliderVal == 100) {
  800 +
  801 + document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 46)) + 'px';
  802 + document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 28)) + 'px';
  803 + }
  804 + else if ($scope.sliderVal == 85) {
  805 +
  806 + document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 44)) + 'px';
  807 + document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 26)) + 'px';
  808 + } else if ($scope.sliderVal == 70) {
  809 +
  810 + document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 42)) + 'px';
  811 + document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 24)) + 'px';
  812 + }
  813 + else if ($scope.sliderVal == 55) {
  814 +
  815 + document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 40)) + 'px';
  816 + document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 22)) + 'px';
  817 + }
  818 + else if ($scope.sliderVal == 40) {
  819 +
  820 + document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 38)) + 'px';
  821 + document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 20)) + 'px';
  822 + }
  823 + else if ($scope.sliderVal == 25) {
  824 +
  825 + document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 36)) + 'px';
  826 + document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 18)) + 'px';
  827 + }
801 828 document.getElementById('speechBubble' + PinId + '').style.display = 'block';
802   - document.getElementById('speechBubble' + PinId + '').style.left = (speechBubbleDims[0].currentX - 70 * $scope.sliderPercentValue) + 'px';
803   - document.getElementById('speechBubble' + PinId + '').style.top = (speechBubbleDims[0].currentY - 58 * $scope.sliderPercentValue) + 'px';
  829 + document.getElementById('speechBubble' + PinId + '').style.left = (speechBubbleDims[0].currentX - 70) + 'px';
  830 + document.getElementById('speechBubble' + PinId + '').style.top = (speechBubbleDims[0].currentY - 58) + 'px';
804 831  
805 832 $('.common-drag').draggable(
806 833 {
... ... @@ -890,7 +917,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
890 917 var f = cx;
891 918  
892 919 if (BoolValues == true) {
893   - $("#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%' });
  920 + if ($scope.sliderVal == 40) {
  921 + $("#speechBubbleDraggedLine" + id).css({ 'display': 'block', 'width': d + 'px', 'top': (e - 5) + 'px', 'left': (f - 5) + 'px', 'transform': 'rotate(' + theta + 'deg)', '-moz-transform': 'rotate(' + theta + 'deg)', '-webkit-transform': 'rotate(' + theta + 'deg)', 'transform-origin': '0% 0%' });
  922 + }
  923 + else if ($scope.sliderVal == 25) {
  924 + $("#speechBubbleDraggedLine" + id).css({ 'display': 'block', 'width': d + 'px', 'top': (e - 2) + 'px', 'left': (f - 2) + 'px', 'transform': 'rotate(' + theta + 'deg)', '-moz-transform': 'rotate(' + theta + 'deg)', '-webkit-transform': 'rotate(' + theta + 'deg)', 'transform-origin': '0% 0%' });
  925 + }
  926 + else {
  927 + $("#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%' });
  928 + }
  929 +
894 930 }
895 931 else {
896 932 $("#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%' });
... ... @@ -917,7 +953,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
917 953 layer: true,
918 954 name: "Pin_" + PinId,
919 955 groups: ["Pin_" + PinId],
920   - strokeStyle: 'black',
  956 + strokeStyle: '#565656',
921 957 strokeWidth: 2,
922 958 visible: true,
923 959 x1: offsetX1 * $scope.sliderPercentValue, y1: offsetY1 * $scope.sliderPercentValue,
... ... @@ -1515,7 +1551,7 @@ function onZoom(scope) {
1515 1551 //6. Show all pins on AA opened item
1516 1552 }
1517 1553  
1518   -var sliderVal = 0.0;
  1554 +
1519 1555 $(document).ready(function () {
1520 1556 $(".slider").slider({
1521 1557 min: 25,
... ... @@ -1525,10 +1561,12 @@ $(document).ready(function () {
1525 1561 orientation: "vertical",
1526 1562 slide: function (event, ui) {
1527 1563  
1528   - sliderVal = ui.value;
  1564 +
1529 1565  
1530 1566 var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1531 1567 scope.$apply(function () {
  1568 + scope.sliderVal = ui.value;
  1569 + scope.removeSpeechBubble();
1532 1570 var relativeWidth = 0;
1533 1571 var relativeHeight = 0;
1534 1572  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @e25b758
... ... @@ -86,7 +86,7 @@
86 86 </div>
87 87 &nbsp;
88 88 <!-- Single button -->
89   - <div class="btn-group">
  89 + <div class="btn-group" style="vertical-align:top;">
90 90 <button type="button" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
91 91 <i class="fa fa-arrow-circle-right"></i>
92 92 </button>
... ...