diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index a249e98..8d393d0 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -35,7 +35,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.transNumber = 100;
$rootScope.modestyCanvasZindex = 12100;
- $rootScope.isModestyCanvasVisible = false;
+ $rootScope.isTBoxModestyVisible = false;
//for transarency scale
$scope.TBDrawStartX;
$scope.TBDrawStartY;
@@ -3252,7 +3252,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if (parseInt(termNumber) != parseInt(figLeafTermNo)) {
$scope.TermNumber = termNumber;
for (var j = 0; j <= $rootScope.lexiconLanguageArray.length - 1; j++) {
- if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined) {
+ if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined)
+ {
$scope.matchedTermNoData = new jinqJs()
.from($rootScope.TermNumberData.TermData.Term)
.where('_TermNumber == ' + termNumber)
@@ -3279,8 +3280,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
}
else {
- $rootScope.loadSearchData();
- $scope.GetAnnotationText(termNumber);
+ var currentBodyViewId = $rootScope.voId;
+ var termJsonPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_tm_sg_' + currentBodyViewId + '.json';
+ DataService.getAnotherJson(termJsonPath)
+ .then(
+ function (result) {
+ $rootScope.TermNumberData = result;
+ $scope.GetAnnotationText(termNumber);
+ })
}
}
}
@@ -3650,7 +3657,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// we decide the size of speech bubble
//2.
- if (event.ctrlKey) {
+ if (event.ctrlKey) {
console.log('ctrl pressed');
$scope.multiAnnotationIsON = true;
//2.1 create unique speech bubbles
@@ -3769,12 +3776,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
});
}
}
+
if (document.getElementById("btnStrutureBox").name == "showAnnotationStructure") {
$scope.showAnnotation()
}
else {
$scope.hideAnnotation()
}
+
if ($rootScope.isTBCompleted == true) {
$('#sppeachBubble').remove();
$('#dot').remove();
@@ -4044,7 +4053,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
}
$scope.createSpeechBubbleBasedOnTransparencyWithoutCtrl = function (x, y) {
-
+ $("#bord_annotation").remove();
+ $("#sppeachBubble_annotation").remove();
+ $("#dot_annotation").remove();
var sppechBubbleDotHTML_annotation = ''
+ ''
+ ''
@@ -4633,7 +4644,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$("#annotationpaintbrushsize").removeClass("activebtncolor");
$("#annotationpainteraser").removeClass("activebtncolor");
if ($("#DrawMode").hasClass("annotationtoolbartab")) {
- if ($rootScope.isModestyCanvasVisible == true) {
+ if ($rootScope.isTBoxModestyVisible == true) {
$rootScope.switchCanvas();
@@ -4868,7 +4879,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
if (document.getElementById(modestyTransCanvasId) == null || document.getElementById(modestyTransCanvasId) == undefined) {
- $rootScope.isModestyCanvasVisible = true;
+ $rootScope.isTBoxModestyVisible = true;
var canvasModesty = document.createElement('canvas');
canvasModesty.id = modestyTransCanvasId;
canvasModesty.height = Height;
@@ -4877,7 +4888,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
canvasModesty.style.left = X + 'px';
canvasModesty.style.top = Y + 'px';
canvasModesty.style.visibility = 'visible';
- canvasModesty.style.zIndex = $rootScope.modestyCanvasZindex;
+ if($rootScope.currentBodyViewId=="11"){
+
+ canvasModesty.style.zIndex = 11000;
+ }
+ else
+ canvasModesty.style.zIndex = $rootScope.modestyCanvasZindex;
canvasModesty.addEventListener('click', OnClickModestyTransCanvas);
document.getElementById('canvasDiv').appendChild(canvasModesty);
@@ -5508,11 +5524,23 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var bodyRegionRight = parseInt(value.X) + parseInt(value.Width);
var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height);
if ($rootScope.Xaxis <= bodyRegionRight && $rootScope.Yaxis <= bodyRegionBottom && value.X <= $rootScope.Xaxis && value.Y <= $rootScope.Yaxis) {
- $rootScope.BRId = value.bodyRegionId;
- $rootScope.BodyRegionXAxis = value.X;
- $rootScope.BodyRegionYAxis = value.Y;
- $rootScope.isMirrorBodyRegion = value.IsMirror;
- return false;
+ if ($rootScope.currentBodyViewId == "11" || $rootScope.currentBodyViewId == "9") {
+ if (value.bodyRegionId == "6") {
+ $rootScope.BRId = value.bodyRegionId;
+ $rootScope.BodyRegionXAxis = value.X;
+ $rootScope.BodyRegionYAxis = value.Y;
+ $rootScope.isMirrorBodyRegion = value.IsMirror;
+ return false;
+ }
+ }
+ else {
+ $rootScope.BRId = value.bodyRegionId;
+ $rootScope.BodyRegionXAxis = value.X;
+ $rootScope.BodyRegionYAxis = value.Y;
+ $rootScope.isMirrorBodyRegion = value.IsMirror;
+ return false;
+ }
+
}
});
}
@@ -6284,7 +6312,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.CloseTransparencyBox = function () {
- $rootScope.isModestyCanvasVisible = false;
+ $rootScope.isTBoxModestyVisible = false;
//for enabling annoataions.
//Now everything si done on canavases uswed in annotation toolbar.
@@ -6980,7 +7008,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.enableShowHideStructureBox = function () {
-
+
//if listanager is visisble then close it
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 880fc9e..bb8627e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1104,8 +1104,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
}
$rootScope.switchToTransparencycanvas = function () {
-
- if ($rootScope.isModestyCanvasVisible == true) {
+
+ if ($rootScope.isTBoxModestyVisible == true) {
var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
for (var j = 0; j < modestyTransCanvases.length; j++) {
@@ -1114,15 +1114,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
if (ctx.style.visibility == "visible") {
if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
-
+
var drawCanvasZindex = $("#canvas").css("z-index");
var paintCanvasZindex = $("#canvasPaint").css("z-index");
var TransCanvasZindex = ctx.style.zIndex;
var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex, TransCanvasZindex);
MaxZindexVal = MaxZindexVal + 1;
$("#canvas").css("z-index", MaxZindexVal);
- $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+ if ($rootScope.currentBodyViewId == "11") {
+ $(".ui-wrapper").css("z-index", MaxZindexVal + 1);
+ $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+ }
+ else {
+ $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+ }
}
else {
var drawCanvasZindex = $("#canvas").css("z-index");
@@ -1132,11 +1138,19 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
MaxZindexVal = parseInt(MaxZindexVal + 1);
if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
-
$("#canvasPaint").css("z-index", MaxZindexVal);
}
else {
+
$("#canvas").css("z-index", MaxZindexVal);
+ if ($rootScope.currentBodyViewId == "11") {
+ $(".ui-wrapper").css("z-index", MaxZindexVal);
+ }
+ else
+ {
+ $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+ }
+
}
}
@@ -1404,7 +1418,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
}
$rootScope.switchCanvasToPaintCanvas = function (e) {
- if ($rootScope.isModestyCanvasVisible == true) {
+ if ($rootScope.isTBoxModestyVisible == true) {
var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
for (var j = 0; j < modestyTransCanvases.length; j++) {
@@ -1549,8 +1563,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$rootScope.switchCanvas = function () {
-
- if ($rootScope.isModestyCanvasVisible == true) {
+
+ if ($rootScope.isTBoxModestyVisible == true) {
var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
for (var j = 0; j < modestyTransCanvases.length; j++) {
@@ -1574,11 +1588,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
else {
if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
-
- $("#canvasPaint").css("z-index", MaxZindexVal);
+ if ($rootScope.currentBodyViewId == "11") { $("#canvasPaint").css("z-index", MaxZindexVal + 1); }
+ else{ $("#canvasPaint").css("z-index", MaxZindexVal);}
}
else {
- $("#canvas").css("z-index", MaxZindexVal);
+ if ($rootScope.currentBodyViewId == "11") {
+ $("#canvas").css("z-index", MaxZindexVal + 1);
+ }
+ else
+ {
+ $("#canvas").css("z-index", MaxZindexVal);
+ }
}
}
@@ -3760,7 +3780,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
}
$rootScope.CloseListManager = function () {
-
$("#btnTranparency").removeAttr('disabled', 'disabled');
$("#optionsListManagerTab").removeClass("active");
$rootScope.isListManagerMenuSelected = false;
@@ -3776,7 +3795,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$("#annotationpainteraser").removeAttr('disabled', 'disabled');
$("#annotationpaintbrushsize").css('pointer-events', 'auto');
$("#annotationpainteraser").css('pointer-events', 'auto');
- $rootScope.switchCanvasToPaintCanvas();
+ if ($(".annotationTollbar").css("display") == "block") {
+ $rootScope.switchCanvasToPaintCanvas();
+ }
}
}
if ($location.path() == "/module-item-view") {