ADAM / AIAHTML5

Commit bcb022ff14824ca64ed096054f6701746c057f78

Authored by Amrita Vishnoi
1 parent e28bc649

Wait cursor is closed on list manager close

Inline Side-by-side
Showing 2 changed files with 8 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @bcb022f
... ... @@ -30,7 +30,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
30 30 //for transarency scale
31 31 $scope.TBDrawStartX;
32 32 $scope.TBDrawStartY;
33   - $rootScope.path = "/AIA/content/images/speeachBubbleClose.png";
  33 + $rootScope.path = "/AIAHTML5/content/images/speeachBubbleClose.png";
34 34 $rootScope.isHighLight = false;
35 35 $rootScope.coloredImageCanvasList = [];
36 36 $rootScope.coloredImageMRCanvasList = [];
... ... @@ -2073,7 +2073,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2073 2073 var pointClicked = parseInt(x) + parseInt(y);
2074 2074 var Exists = $("#canvasDiv").find("div[id=" + pointClicked + "]").length;
2075 2075 // alert(pointClicked);
2076   - var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.i + "'></div><div data=" + $scope.i + " id=" + sub_id + " class='appendDragg' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size: 12px;background-color:#fff;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.i + " class='dynCross' src='/AIA/content/images/speeachBubbleClose.png'></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.i + "'></div></div>";
  2076 + var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.i + "'></div><div data=" + $scope.i + " id=" + sub_id + " class='appendDragg' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size: 12px;background-color:#fff;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.i + " class='dynCross' src='/AIAHTML5/content/images/speeachBubbleClose.png'></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.i + "'></div></div>";
2077 2077  
2078 2078 $("#canvasDiv").append(sppechBubbleHTML);
2079 2079  
... ... @@ -2314,7 +2314,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2314 2314 var Exists_annotation = $("#canvasDiv").find("div[id=" + pointClicked_annotation + "]").length;
2315 2315 // alert(Exists_annotation);
2316 2316 // alert(pointClicked_annotation);
2317   - var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size: 12px;background-color:#fff;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' src='/AIA/content/images/speeachBubbleClose.png'></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord_annotation" + $scope.j + "'></div></div>";
  2317 + var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size: 12px;background-color:#fff;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' src='/AIAHTML5</content/images/speeachBubbleClose.png'></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord_annotation" + $scope.j + "'></div></div>";
2318 2318 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
2319 2319 if (Exists_annotation == 0) {
2320 2320 $("#canvasDiv").append(sppechBubbleHTML_annotation);
... ... @@ -4610,6 +4610,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4610 4610 //clsoe worker process
4611 4611 $scope.$on('jsPanelCloseEvent', function (event, data) {
4612 4612  
  4613 +
  4614 +
4613 4615 console.log('terminate worker process')
4614 4616 //terminate previous running workers to create space for new workers
4615 4617 if ($scope.runningWorkers != null) {
... ... @@ -4624,6 +4626,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4624 4626 }
4625 4627 }
4626 4628  
  4629 + $rootScope.isLoading = false;
  4630 + $('#spinner').css('visibility', 'hidden');
4627 4631 })
4628 4632  
4629 4633 $scope.loadSelectedBodyView = function (currentBodyViewId) {
... ...
400-SOURCECODE/AIAHTML5.Web/extract-wp.js
  View file @bcb022f
... ... @@ -18,6 +18,7 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo
18 18 grayImageData = previousGrayImageDataList[parseInt(bodyRegionId - 1)];
19 19  
20 20 }
  21 +
21 22 if (grayImageData != null) {
22 23 var grayImageDataVar = grayImageData.data;
23 24 var coloredImageDataVar = coloredImageData.data;
... ...