ADAM / AIAHTML5

Commit ab1cc924a36cfd7bb31f729b5251938fa10d4d73

Authored by Amrita Vishnoi
2 parents 730793e1 21cb7f56

Merge branch 'Bug#25495' into Develop-IPAD-MAC

Inline Side-by-side
Showing 2 changed files with 26 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ab1cc92
... ... @@ -3617,7 +3617,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3617 3617  
3618 3618 }
3619 3619  
3620   -
  3620 + else {
  3621 + $scope.EnableUI();
  3622 + }
3621 3623 })
3622 3624  
3623 3625 }
... ... @@ -4396,8 +4398,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4396 4398  
4397 4399  
4398 4400 $('#btnTranparency').addClass('tButtonActive');
4399   - $('#btnIdentity').removeClass(' btn-primary');
4400   - $('#btnIdentity').addClass('btn-black');
  4401 + $('#btnIdentify').removeClass(' btn-primary');
  4402 + $('#btnIdentify').addClass('btn-black');
4401 4403  
4402 4404 var canvasDiv = document.getElementById('canvasDiv');
4403 4405 $scope.verticalScrollPosition = canvasDiv.scrollTop;
... ... @@ -4798,8 +4800,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4798 4800 //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4799 4801 $('#btnTranparency').removeClass('tButtonActive');
4800 4802 $('#btnTranparency').addClass('btn-black');
4801   - $('#btnIdentity').removeClass('btn-black');
4802   - $('#btnIdentity').addClass('btn-primary');
  4803 + $('#btnIdentify').removeClass('btn-black');
  4804 + $('#btnIdentify').addClass('btn-primary');
4803 4805  
4804 4806 // clear canvas before drawing transparency box
4805 4807 if ($rootScope.isAnnotationWindowOpen == true) {
... ... @@ -5909,7 +5911,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5909 5911 if (TBStartX <= bodyRegionRight && value.X <= TBRight && TBStartY <= bodyRegionBottom && value.Y <= TBBottom) {
5910 5912  
5911 5913 if ($scope.isTBDrawnOnBodyRegion == false) {
5912   - $scope.layerNumber = $scope.layerNumber + 1;
  5914 +
  5915 +
  5916 + if ($scope.layerNumber < $rootScope.totalLayers) {
  5917 +
  5918 + $scope.layerNumber = $scope.layerNumber + 1;
  5919 +
  5920 + }
  5921 +
5913 5922 }
5914 5923  
5915 5924 if (value.bodyRegionId == '3') {
... ... @@ -6684,9 +6693,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6684 6693 // document.getElementById('btnTranparency').className = 't-transparency'
6685 6694 $('#btnTranparency').removeClass('tButtonActive');
6686 6695 $('#btnTranparency').addClass('btn-black');
6687   - $('#btnIdentity').removeClass('btn-black');
  6696 + $('#btnIdentify').removeClass('btn-black');
6688 6697  
6689   - $('#btnIdentity').addClass('btn-primary');
  6698 + $('#btnIdentify').addClass('btn-primary');
6690 6699  
6691 6700 document.getElementById('btnTranparency').removeEventListener("click", $scope.createTransparencyBox);
6692 6701  
... ... @@ -6777,14 +6786,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6777 6786 };
6778 6787  
6779 6788  
6780   - $scope.IdentityClick = function () {
  6789 + $scope.IdentifyClick = function () {
6781 6790  
6782 6791  
6783 6792 //if listanager is visisble then close it
6784 6793  
6785 6794 $rootScope.isListManagerSelected = false;
6786 6795 $rootScope.CloseListManager();
6787   - // $('#btnIdentity').addClass('btn-primary');
  6796 + // $('#btnIdentify').addClass('btn-primary');
6788 6797  
6789 6798 if ($scope.isTransparencyBtnClicked == true) {
6790 6799  
... ... @@ -6798,6 +6807,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6798 6807 canvasDiv.removeEventListener("mouseup", mouseUpListener)
6799 6808 $('#btnTranparency').removeClass('tButtonActive');
6800 6809 $('#btnTranparency').addClass('btn-black');
  6810 +
  6811 + $("#btnExtract").removeClass("disabled");
  6812 + $("#btnExtract").css("pointer-events", "auto");
6801 6813 }
6802 6814  
6803 6815 }
... ... @@ -9726,11 +9738,11 @@ function OnEnableHighlight() {
9726 9738 });
9727 9739 }
9728 9740  
9729   -function OnIdentityClick() {
9730   - console.log('OnIdentityClick is called outside ');
  9741 +function OnIdentifyClick() {
  9742 + console.log('OnIdentifyClick is called outside ');
9731 9743 var scope = angular.element(document.getElementById("daView")).scope();
9732 9744 scope.$apply(function () {
9733   - scope.IdentityClick();
  9745 + scope.IdentifyClick();
9734 9746 });
9735 9747 }
9736 9748  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @ab1cc92
... ... @@ -139,7 +139,7 @@
139 139 <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div>
140 140 <div class="" style="top:20px">
141 141 <div class="col-xs-6">
142   - <button id="btnIdentity" onclick="OnIdentityClick()" class="btn btn-primary btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button>
  142 + <button id="btnIdentify" onclick="OnIdentifyClick()" class="btn btn-primary btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button>
143 143 </div>
144 144 <div class="col-xs-6 pull-right">
145 145 <button class="btn btn-black btn-sm pull-right tooltip-custom" onclick="OnZoom()" id="btnZoom" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out">
... ...