diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 65ddd82..3bc5e05 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1001,13 +1001,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#draggable').css('width', dragdivw); $('#draggable').css('height', dragdivh) - document.getElementById('btnTranparency').addEventListener('click', $scope.createTransparencyBox); + // document.getElementById('btnTranparency').addEventListener('click', $scope.createTransparencyBox); document.getElementById('btnNormalMode').addEventListener('click', $scope.enableNormalMode); document.getElementById('btnExtract').addEventListener('click', $scope.enableExtract); document.getElementById('btnHighLight').addEventListener('click', $scope.enableHighlight); document.getElementById('btnIdentity').addEventListener('click', $scope.OnIdentityClick); document.getElementById('btnZoom').addEventListener('click', $scope.enableZoom); - document.getElementById('btnTBoxClose').addEventListener('click', $scope.CloseTransparencyBox); + //document.getElementById('btnTBoxClose').addEventListener('click', $scope.CloseTransparencyBox); } @@ -3586,7 +3586,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.TransparencyEndX = TransparencyEndX; $scope.TransparencyBoxEndY = TransparencyBoxEndY; - + $scope.layerNumberBeforeTrans = parseInt($('#txtlayerNumber').val()); //draw temp box to store the canvas data with original transparecy if (document.getElementById('tempCanvas') != null) { @@ -3871,7 +3871,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // alert('isMousUp on isLayerChanged'); - $scope.layerNumber = parseInt($('#txtlayerNumber').val()); + // $scope.layerNumber = parseInt($('#txtlayerNumber').val()); } else { @@ -3881,7 +3881,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //$scope.layerNumber = tranparencyLayer; var tranparencyLayer; - var currentLayer = parseInt($('#txtlayerNumber').val()); + + var currentLayer = $scope.layerNumberBeforeTrans; + if (currentLayer == $rootScope.totalLayers) { tranparencyLayer = currentLayer; @@ -4573,7 +4575,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.CloseTransparencyBox = function () { - alert('CloseTransparencyBox is called'); + //To enable extract button $rootScope.isTransparencyActivated = false; $("#btnExtract").removeClass("disabled"); @@ -7967,3 +7969,12 @@ function onTboxCreation() scope.createTransparencyBox('true'); }); } + +function onTboxClose() +{ + console.log('onTboxClose is called outside '); + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + scope.CloseTransparencyBox(); + }); +} diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index 1367b80..26a13fc 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -363,7 +363,7 @@