diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index c919bd6..91331af 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1728,8 +1728,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var canvasDiv = document.getElementById('canvasDiv');
- var verticalScrollPosition = canvasDiv.scrollTop;
- var horizontlScrollPosition = canvasDiv.scrollLeft;
+ var verticalScrollPosition = Math.round(canvasDiv.scrollTop)-1;
+ var horizontlScrollPosition = Math.round(canvasDiv.scrollLeft)-1;
var distanceXOnMirrorImage = (parseInt(mirrorCanvasX) + parseInt(mirrorCanvasWidth)) - (parseInt(mousePos.x) + horizontlScrollPosition);// - 135);
@@ -2163,8 +2163,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//We substracted 135, as the difference between flex and html coordinates for same organ is 135
- var actulalX = mousePos.x + horizontlScrollPosition;
- var actualY = mousePos.y + verticalScrollPosition;
+ var actulalX = mousePos.x + Math.round(horizontlScrollPosition)-1;
+ var actualY = mousePos.y + Math.round(verticalScrollPosition)-1;
var RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y);
@@ -3896,7 +3896,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if ($scope.speechbubbleList != null || $scope.speechbubbleList != undefined) {
for (var m = 0; m <= $scope.speechbubbleList.length - 1; m++) {
if ($scope.speechbubbleList[m].ids == sub_id1) {
- $scope.angle1($scope.speechbubbleList[m].xaxis, $scope.speechbubbleList[m].yaxis, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, bor_id);
+ $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);
break;
}
}
@@ -3926,7 +3926,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$("#dot").css("visibility", "hidden");
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
- $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
+ $scope.angle(x-0.5, y-0.5, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
},
});
$('.crossDiv_temp').on('click', function (evt) {
@@ -3956,7 +3956,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if ($scope.speachBubbleArrayAnnotation != null || $scope.speachBubbleArrayAnnotation != undefined) {
for (var m = 0; m <= $scope.speachBubbleArrayAnnotation.length - 1; m++) {
if ($scope.speachBubbleArrayAnnotation[m].ids == sub_id1_anno) {
- $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);
+ $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);
break;
}
}
@@ -3979,7 +3979,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$("#dot_annotation").remove();
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
- $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
+ $scope.angle(x-0.5, y-0.5, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
},
});
$('.crossDiv_temp_annotation').on('click', function (evt) {
@@ -4030,7 +4030,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) {
- var sppechBubbleHTML = "";
+ var sppechBubbleHTML = "";
//Issue #7286 :Undefined annotation should not appear
for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
var annotation = $scope.MultiLanguageAnnationArray[i];
@@ -4163,11 +4163,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var Globe = [];
Globe.push({ currentX: x, currentY: y });
document.getElementById('dot').style.display = 'block';
- document.getElementById('dot').style.left = ((Globe[0].currentX) - 6) + 'px';
- document.getElementById('dot').style.top = ((Globe[0].currentY) + 11) + 'px';
+ document.getElementById('dot').style.left = ((Globe[0].currentX) - 5) + 'px';
+ document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px';
document.getElementById('bord').style.display = 'block';
- document.getElementById('bord').style.left = ((Globe[0].currentX) - 2) + 'px';
- document.getElementById('bord').style.top = ((Globe[0].currentY) + 1) + 'px';
+ document.getElementById('bord').style.left = ((Globe[0].currentX) - 1) + 'px';
+ document.getElementById('bord').style.top = ((Globe[0].currentY) + 0) + 'px';
document.getElementById('sppeachBubble').style.display = 'block';
document.getElementById('sppeachBubble').style.left = (Globe[0].currentX) + 'px';
document.getElementById('sppeachBubble').style.top = (Globe[0].currentY) + 'px';
@@ -4177,7 +4177,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.createSpeechBubbleBasedOnTransparencyWithCtrl = function (pointClicked_annotation, Exists_annotation, x, y, sub_id_annotation) {
- var sppechBubbleHTML_annotation = "";
+ var sppechBubbleHTML_annotation = "";
if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
if (Exists_annotation == 0) {
$("#canvasDiv").append(sppechBubbleHTML_annotation);
@@ -4364,11 +4364,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var Globe = [];
Globe.push({ currentX: x, currentY: y });
document.getElementById('dot_annotation').style.display = 'block';
- document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 6) + 'px';
- document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 11) + 'px';
+ document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 5) + 'px';
+ document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px';
document.getElementById('bord_annotation').style.display = 'block';
- document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 2) + 'px';
- document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 1) + 'px';
+ document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 1) + 'px';
+ document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 0) + 'px';
document.getElementById('sppeachBubble_annotation').style.display = 'block';
document.getElementById('sppeachBubble_annotation').style.left = (Globe[0].currentX) + 'px';
document.getElementById('sppeachBubble_annotation').style.top = (Globe[0].currentY) + 'px';
@@ -4746,6 +4746,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
transparencyCanvas.addEventListener('click', TransparencyCanvasClickListener);
$(".ui-wrapper").css("z-index", $rootScope.UIWrapperZIndex);
+ $(".ui-wrapper").css("left",$scope.startX-2+ 'px');
}
if ($scope.TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && $scope.TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) {
@@ -5967,6 +5968,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#transparencyCanvas').resizable({ handles: "e,s,se,w,n,ne,nw,sw", stop: function (event, ui) { resizeTransparencyBox(); }, start: function (event, ui) { clearTransCanvas(); } });
$(".ui-wrapper").css("z-index", $rootScope.UIWrapperZIndex);
+ $(".ui-wrapper").css("left",tCanvas.style.left.replace('px','')-2+ 'px');
//bind click listener
transparencyCanvas.addEventListener('click', TransparencyCanvasClickListener);
@@ -6149,8 +6151,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//We substracted 135, as the difference between flex and html coordinates for same organ is 135
- var actulalX = mousePos.x + horizontlScrollPosition;
- var actualY = mousePos.y + verticalScrollPosition //- 135; //+ tomenuBarheight + titleBarheight + searchComboheight;
+ var actulalX = mousePos.x + Math.round(horizontlScrollPosition)-1;
+ var actualY = mousePos.y + Math.round(verticalScrollPosition)-1; //- 135; //+ tomenuBarheight + titleBarheight + searchComboheight;
var clickedBodyRegion;
var x;
var y;
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
index 627b43c..88016ec 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -1323,7 +1323,7 @@ footer .browserIcons
.singleLineAnnotation {
position:absolute;
- width:35px;
+ width:36px;
display:none;
border-top:2px solid #000;
transform:rotate(40deg);