ADAM / AIAHTML5

Commit cd18328f6bd5a694cb4d487e125c4bfab57e7af1

Authored by Birendra
1 parent 0044ac0e

fixing wrong place line pointing and struture

Inline Side-by-side
Showing 2 changed files with 23 additions and 21 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @cd18328
... ... @@ -1728,8 +1728,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1728 1728  
1729 1729  
1730 1730 var canvasDiv = document.getElementById('canvasDiv');
1731   - var verticalScrollPosition = canvasDiv.scrollTop;
1732   - var horizontlScrollPosition = canvasDiv.scrollLeft;
  1731 + var verticalScrollPosition = Math.round(canvasDiv.scrollTop)-1;
  1732 + var horizontlScrollPosition = Math.round(canvasDiv.scrollLeft)-1;
1733 1733  
1734 1734 var distanceXOnMirrorImage = (parseInt(mirrorCanvasX) + parseInt(mirrorCanvasWidth)) - (parseInt(mousePos.x) + horizontlScrollPosition);// - 135);
1735 1735  
... ... @@ -2163,8 +2163,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2163 2163  
2164 2164  
2165 2165 //We substracted 135, as the difference between flex and html coordinates for same organ is 135
2166   - var actulalX = mousePos.x + horizontlScrollPosition;
2167   - var actualY = mousePos.y + verticalScrollPosition;
  2166 + var actulalX = mousePos.x + Math.round(horizontlScrollPosition)-1;
  2167 + var actualY = mousePos.y + Math.round(verticalScrollPosition)-1;
2168 2168 var RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y);
2169 2169  
2170 2170  
... ... @@ -3896,7 +3896,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3896 3896 if ($scope.speechbubbleList != null || $scope.speechbubbleList != undefined) {
3897 3897 for (var m = 0; m <= $scope.speechbubbleList.length - 1; m++) {
3898 3898 if ($scope.speechbubbleList[m].ids == sub_id1) {
3899   - $scope.angle1($scope.speechbubbleList[m].xaxis, $scope.speechbubbleList[m].yaxis, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, bor_id);
  3899 + $scope.angle1($scope.speechbubbleList[m].xaxis-0.5, $scope.speechbubbleList[m].yaxis-0.5, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, bor_id);
3900 3900 break;
3901 3901 }
3902 3902 }
... ... @@ -3926,7 +3926,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3926 3926 $("#dot").css("visibility", "hidden");
3927 3927 var verticalScrollPosition = canvasDiv.scrollTop;
3928 3928 var horizontlScrollPosition = canvasDiv.scrollLeft;
3929   - $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
  3929 + $scope.angle(x-0.5, y-0.5, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
3930 3930 },
3931 3931 });
3932 3932 $('.crossDiv_temp').on('click', function (evt) {
... ... @@ -3956,7 +3956,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3956 3956 if ($scope.speachBubbleArrayAnnotation != null || $scope.speachBubbleArrayAnnotation != undefined) {
3957 3957 for (var m = 0; m <= $scope.speachBubbleArrayAnnotation.length - 1; m++) {
3958 3958 if ($scope.speachBubbleArrayAnnotation[m].ids == sub_id1_anno) {
3959   - $scope.angle1($scope.speachBubbleArrayAnnotation[m].xaxis, $scope.speachBubbleArrayAnnotation[m].yaxis, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, bor_id_anno);
  3959 + $scope.angle1($scope.speachBubbleArrayAnnotation[m].xaxis-0.5, $scope.speachBubbleArrayAnnotation[m].yaxis-0.5, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, bor_id_anno);
3960 3960 break;
3961 3961 }
3962 3962 }
... ... @@ -3979,7 +3979,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3979 3979 $("#dot_annotation").remove();
3980 3980 var verticalScrollPosition = canvasDiv.scrollTop;
3981 3981 var horizontlScrollPosition = canvasDiv.scrollLeft;
3982   - $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
  3982 + $scope.angle(x-0.5, y-0.5, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
3983 3983 },
3984 3984 });
3985 3985 $('.crossDiv_temp_annotation').on('click', function (evt) {
... ... @@ -4030,7 +4030,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4030 4030 }
4031 4031  
4032 4032 $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) {
4033   - var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div class='multiLineAnnotation' style='z-index:60000;left:" + (x - 6) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
  4033 + var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div class='multiLineAnnotation' style='z-index:60000;left:" + (x - 5) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
4034 4034 //Issue #7286 :Undefined annotation should not appear
4035 4035 for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
4036 4036 var annotation = $scope.MultiLanguageAnnationArray[i];
... ... @@ -4163,11 +4163,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4163 4163 var Globe = [];
4164 4164 Globe.push({ currentX: x, currentY: y });
4165 4165 document.getElementById('dot').style.display = 'block';
4166   - document.getElementById('dot').style.left = ((Globe[0].currentX) - 6) + 'px';
4167   - document.getElementById('dot').style.top = ((Globe[0].currentY) + 11) + 'px';
  4166 + document.getElementById('dot').style.left = ((Globe[0].currentX) - 5) + 'px';
  4167 + document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px';
4168 4168 document.getElementById('bord').style.display = 'block';
4169   - document.getElementById('bord').style.left = ((Globe[0].currentX) - 2) + 'px';
4170   - document.getElementById('bord').style.top = ((Globe[0].currentY) + 1) + 'px';
  4169 + document.getElementById('bord').style.left = ((Globe[0].currentX) - 1) + 'px';
  4170 + document.getElementById('bord').style.top = ((Globe[0].currentY) + 0) + 'px';
4171 4171 document.getElementById('sppeachBubble').style.display = 'block';
4172 4172 document.getElementById('sppeachBubble').style.left = (Globe[0].currentX) + 'px';
4173 4173 document.getElementById('sppeachBubble').style.top = (Globe[0].currentY) + 'px';
... ... @@ -4177,7 +4177,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4177 4177 }
4178 4178 $scope.createSpeechBubbleBasedOnTransparencyWithCtrl = function (pointClicked_annotation, Exists_annotation, x, y, sub_id_annotation) {
4179 4179  
4180   - var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div class='multiLineAnnotation' style='z-index:59000;left:" + (x - 6) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:59000;' id='bord_annotation" + $scope.j + "'></div></div>";
  4180 + var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div class='multiLineAnnotation' style='z-index:59000;left:" + (x - 5) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:59000;' id='bord_annotation" + $scope.j + "'></div></div>";
4181 4181 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
4182 4182 if (Exists_annotation == 0) {
4183 4183 $("#canvasDiv").append(sppechBubbleHTML_annotation);
... ... @@ -4364,11 +4364,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4364 4364 var Globe = [];
4365 4365 Globe.push({ currentX: x, currentY: y });
4366 4366 document.getElementById('dot_annotation').style.display = 'block';
4367   - document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 6) + 'px';
4368   - document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 11) + 'px';
  4367 + document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 5) + 'px';
  4368 + document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px';
4369 4369 document.getElementById('bord_annotation').style.display = 'block';
4370   - document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 2) + 'px';
4371   - document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 1) + 'px';
  4370 + document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 1) + 'px';
  4371 + document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 0) + 'px';
4372 4372 document.getElementById('sppeachBubble_annotation').style.display = 'block';
4373 4373 document.getElementById('sppeachBubble_annotation').style.left = (Globe[0].currentX) + 'px';
4374 4374 document.getElementById('sppeachBubble_annotation').style.top = (Globe[0].currentY) + 'px';
... ... @@ -4746,6 +4746,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4746 4746 transparencyCanvas.addEventListener('click', TransparencyCanvasClickListener);
4747 4747  
4748 4748 $(".ui-wrapper").css("z-index", $rootScope.UIWrapperZIndex);
  4749 + $(".ui-wrapper").css("left",$scope.startX-2+ 'px');
4749 4750  
4750 4751 }
4751 4752 if ($scope.TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && $scope.TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) {
... ... @@ -5967,6 +5968,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5967 5968  
5968 5969 $('#transparencyCanvas').resizable({ handles: "e,s,se,w,n,ne,nw,sw", stop: function (event, ui) { resizeTransparencyBox(); }, start: function (event, ui) { clearTransCanvas(); } });
5969 5970 $(".ui-wrapper").css("z-index", $rootScope.UIWrapperZIndex);
  5971 + $(".ui-wrapper").css("left",tCanvas.style.left.replace('px','')-2+ 'px');
5970 5972  
5971 5973 //bind click listener
5972 5974 transparencyCanvas.addEventListener('click', TransparencyCanvasClickListener);
... ... @@ -6149,8 +6151,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6149 6151  
6150 6152  
6151 6153 //We substracted 135, as the difference between flex and html coordinates for same organ is 135
6152   - var actulalX = mousePos.x + horizontlScrollPosition;
6153   - var actualY = mousePos.y + verticalScrollPosition //- 135; //+ tomenuBarheight + titleBarheight + searchComboheight;
  6154 + var actulalX = mousePos.x + Math.round(horizontlScrollPosition)-1;
  6155 + var actualY = mousePos.y + Math.round(verticalScrollPosition)-1; //- 135; //+ tomenuBarheight + titleBarheight + searchComboheight;
6154 6156 var clickedBodyRegion;
6155 6157 var x;
6156 6158 var y;
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @cd18328
... ... @@ -1323,7 +1323,7 @@ footer .browserIcons
1323 1323  
1324 1324 .singleLineAnnotation {
1325 1325 position:absolute;
1326   - width:35px;
  1326 + width:36px;
1327 1327 display:none;
1328 1328 border-top:2px solid #000;
1329 1329 transform:rotate(40deg);
... ...