diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 17a8aec..aed3623 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -30,7 +30,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//for transarency scale
$scope.TBDrawStartX;
$scope.TBDrawStartY;
- $rootScope.path = "/AIA/content/images/speeachBubbleClose.png";
+ $rootScope.path = "/AIAHTML5/content/images/speeachBubbleClose.png";
$rootScope.isHighLight = false;
$rootScope.coloredImageCanvasList = [];
$rootScope.coloredImageMRCanvasList = [];
@@ -2073,7 +2073,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var pointClicked = parseInt(x) + parseInt(y);
var Exists = $("#canvasDiv").find("div[id=" + pointClicked + "]").length;
// alert(pointClicked);
- var sppechBubbleHTML = "
";
+ var sppechBubbleHTML = "";
$("#canvasDiv").append(sppechBubbleHTML);
@@ -2314,7 +2314,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var Exists_annotation = $("#canvasDiv").find("div[id=" + pointClicked_annotation + "]").length;
// alert(Exists_annotation);
// alert(pointClicked_annotation);
- var sppechBubbleHTML_annotation = "";
+ var sppechBubbleHTML_annotation = "";
if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
if (Exists_annotation == 0) {
$("#canvasDiv").append(sppechBubbleHTML_annotation);
@@ -4610,6 +4610,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//clsoe worker process
$scope.$on('jsPanelCloseEvent', function (event, data) {
+
+
console.log('terminate worker process')
//terminate previous running workers to create space for new workers
if ($scope.runningWorkers != null) {
@@ -4624,6 +4626,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
}
+ $rootScope.isLoading = false;
+ $('#spinner').css('visibility', 'hidden');
})
$scope.loadSelectedBodyView = function (currentBodyViewId) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/extract-wp.js b/400-SOURCECODE/AIAHTML5.Web/extract-wp.js
index 6ad8eb1..7d4b16e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/extract-wp.js
+++ b/400-SOURCECODE/AIAHTML5.Web/extract-wp.js
@@ -18,6 +18,7 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo
grayImageData = previousGrayImageDataList[parseInt(bodyRegionId - 1)];
}
+
if (grayImageData != null) {
var grayImageDataVar = grayImageData.data;
var coloredImageDataVar = coloredImageData.data;