Commit 107a6ba2bb4f9d296f2e250484f08f0ef71632c5
1 parent
17f9fe34
code is in between
Showing
1 changed file
with
30 additions
and
0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -273,7 +273,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
273 | 273 | |
274 | 274 | }; |
275 | 275 | |
276 | + $scope.DisableUI = function () { | |
277 | + alert('disable ui'); | |
278 | + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content"); | |
279 | + for (var i = 0; i < daImagePanelConetent.length; i++) { | |
280 | + daImagePanelConetent[i].style.pointerEvents = "none"; | |
281 | + } | |
282 | + | |
283 | + } | |
276 | 284 | |
285 | + $scope.EnableUI = function () { | |
286 | + alert('enable ui'); | |
287 | + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content"); | |
288 | + for (var i = 0; i < daImagePanelConetent.length; i++) { | |
289 | + daImagePanelConetent[i].style.pointerEvents = "auto"; | |
290 | + } | |
291 | + | |
292 | + alert('enable ui'); | |
293 | + } | |
277 | 294 | |
278 | 295 | $scope.openView = function ($event) { |
279 | 296 | $rootScope.disableAnnotationTB = false; |
... | ... | @@ -1728,6 +1745,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
1728 | 1745 | } |
1729 | 1746 | ); |
1730 | 1747 | } |
1748 | + else if ($scope.ColoredImageSRC.length == totalCanvas) | |
1749 | + { | |
1750 | + // dispatch event for enabling rest UI | |
1751 | + alert('all canvas drawn'); | |
1752 | + $scope.EnableUI(); | |
1753 | + } | |
1754 | + | |
1731 | 1755 | //-NIKI-for solving extarct issue 8286 |
1732 | 1756 | |
1733 | 1757 | var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR'); |
... | ... | @@ -9399,6 +9423,10 @@ function OnIdentityClick() { |
9399 | 9423 | } |
9400 | 9424 | |
9401 | 9425 | function OnZoom() { |
9426 | + alert('on zoom called'); | |
9427 | + var scope = angular.element(document.getElementById("daView")).scope(); | |
9428 | + scope.DisableUI(); | |
9429 | + | |
9402 | 9430 | if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928 |
9403 | 9431 | $(".btn-annotation").removeClass("activebtncolor"); |
9404 | 9432 | //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in. |
... | ... | @@ -9409,6 +9437,8 @@ function OnZoom() { |
9409 | 9437 | scope.$apply(function () { |
9410 | 9438 | scope.enableZoom(); |
9411 | 9439 | }); |
9440 | + | |
9441 | + | |
9412 | 9442 | } |
9413 | 9443 | |
9414 | 9444 | function onListManagerTermSelection(id, isTermListOptionClicked) { | ... | ... |