diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 09e8887..b832000 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -12,6 +12,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $rootScope.BodyRegionData; $rootScope.BodyRegionCordinatesData; $scope.isTransparencyActivated = false; + $scope.isTransparencyBtnClicked = false; $rootScope.BodyLayerData; $rootScope.VocabTermData; @@ -4407,6 +4408,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.isTransparencyActivated = true; + $scope.isTransparencyBtnClicked = false; var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData; @@ -6513,7 +6515,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('.btnCursor').removeClass('activebtncolor'); $(".annotationTollbar").css("display", "none"); $("#annotationButton").removeClass("active"); - $("#btnExtract").removeClass("disabled"); + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { + $("#btnExtract").addClass("disabled"); + $('#btnTranparency').addClass('tButtonActive'); + $('#btnTranparency').removeClass('btn-black'); + } + else + $("#btnExtract").removeClass("disabled"); + $("#btnTranparency").removeClass("disabled"); $rootScope.isTransparencyBoxActivated = false; $rootScope.isNormalMode = false; @@ -6999,6 +7008,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.highLightBody = function () { $scope.CloseTransparencyBox(); + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { + $("#btnExtract").addClass("disabled"); + $('#btnTranparency').addClass('tButtonActive'); + $('#btnTranparency').removeClass('btn-black'); + } $scope.Normal = ""; $scope.Extract = ""; $scope.Highlight = "LeftButtonsDefaultState"; @@ -7500,7 +7514,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //close transparecny box $scope.CloseTransparencyBox(); - + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { + $("#btnExtract").addClass("disabled"); + $('#btnTranparency').addClass('tButtonActive'); + $('#btnTranparency').removeClass('btn-black'); + } //if listanager is visisble then close it // $rootScope.isListManagerSelected = false; @@ -7747,7 +7765,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //close transparency box $scope.CloseTransparencyBox(); - + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { + $("#btnExtract").addClass("disabled"); + $('#btnTranparency').addClass('tButtonActive'); + $('#btnTranparency').removeClass('btn-black'); + } //if listanager is visisble then close it //$rootScope.isListManagerSelected = false;