ADAM / AIAHTML5

Commit 21cb7f56feb39d26c52e6c806a1888165c52c10d

Authored by Nikita Kulshreshtha
1 parent 86b360b8

if layerNo is not less than total layers than the layer will not be increased

Inline Side-by-side
Showing 2 changed files with 26 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @21cb7f5
... ... @@ -3611,7 +3611,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3611 3611  
3612 3612 }
3613 3613  
3614   -
  3614 + else {
  3615 + $scope.EnableUI();
  3616 + }
3615 3617 })
3616 3618  
3617 3619 }
... ... @@ -4390,8 +4392,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4390 4392  
4391 4393  
4392 4394 $('#btnTranparency').addClass('tButtonActive');
4393   - $('#btnIdentity').removeClass(' btn-primary');
4394   - $('#btnIdentity').addClass('btn-black');
  4395 + $('#btnIdentify').removeClass(' btn-primary');
  4396 + $('#btnIdentify').addClass('btn-black');
4395 4397  
4396 4398 var canvasDiv = document.getElementById('canvasDiv');
4397 4399 $scope.verticalScrollPosition = canvasDiv.scrollTop;
... ... @@ -4792,8 +4794,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4792 4794 //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4793 4795 $('#btnTranparency').removeClass('tButtonActive');
4794 4796 $('#btnTranparency').addClass('btn-black');
4795   - $('#btnIdentity').removeClass('btn-black');
4796   - $('#btnIdentity').addClass('btn-primary');
  4797 + $('#btnIdentify').removeClass('btn-black');
  4798 + $('#btnIdentify').addClass('btn-primary');
4797 4799  
4798 4800 // clear canvas before drawing transparency box
4799 4801 if ($rootScope.isAnnotationWindowOpen == true) {
... ... @@ -5903,7 +5905,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5903 5905 if (TBStartX <= bodyRegionRight && value.X <= TBRight && TBStartY <= bodyRegionBottom && value.Y <= TBBottom) {
5904 5906  
5905 5907 if ($scope.isTBDrawnOnBodyRegion == false) {
5906   - $scope.layerNumber = $scope.layerNumber + 1;
  5908 +
  5909 +
  5910 + if ($scope.layerNumber < $rootScope.totalLayers) {
  5911 +
  5912 + $scope.layerNumber = $scope.layerNumber + 1;
  5913 +
  5914 + }
  5915 +
5907 5916 }
5908 5917  
5909 5918 if (value.bodyRegionId == '3') {
... ... @@ -6678,9 +6687,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6678 6687 // document.getElementById('btnTranparency').className = 't-transparency'
6679 6688 $('#btnTranparency').removeClass('tButtonActive');
6680 6689 $('#btnTranparency').addClass('btn-black');
6681   - $('#btnIdentity').removeClass('btn-black');
  6690 + $('#btnIdentify').removeClass('btn-black');
6682 6691  
6683   - $('#btnIdentity').addClass('btn-primary');
  6692 + $('#btnIdentify').addClass('btn-primary');
6684 6693  
6685 6694 document.getElementById('btnTranparency').removeEventListener("click", $scope.createTransparencyBox);
6686 6695  
... ... @@ -6771,14 +6780,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6771 6780 };
6772 6781  
6773 6782  
6774   - $scope.IdentityClick = function () {
  6783 + $scope.IdentifyClick = function () {
6775 6784  
6776 6785  
6777 6786 //if listanager is visisble then close it
6778 6787  
6779 6788 $rootScope.isListManagerSelected = false;
6780 6789 $rootScope.CloseListManager();
6781   - // $('#btnIdentity').addClass('btn-primary');
  6790 + // $('#btnIdentify').addClass('btn-primary');
6782 6791  
6783 6792 if ($scope.isTransparencyBtnClicked == true) {
6784 6793  
... ... @@ -6792,6 +6801,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6792 6801 canvasDiv.removeEventListener("mouseup", mouseUpListener)
6793 6802 $('#btnTranparency').removeClass('tButtonActive');
6794 6803 $('#btnTranparency').addClass('btn-black');
  6804 +
  6805 + $("#btnExtract").removeClass("disabled");
  6806 + $("#btnExtract").css("pointer-events", "auto");
6795 6807 }
6796 6808  
6797 6809 }
... ... @@ -9699,11 +9711,11 @@ function OnEnableHighlight() {
9699 9711 });
9700 9712 }
9701 9713  
9702   -function OnIdentityClick() {
9703   - console.log('OnIdentityClick is called outside ');
  9714 +function OnIdentifyClick() {
  9715 + console.log('OnIdentifyClick is called outside ');
9704 9716 var scope = angular.element(document.getElementById("daView")).scope();
9705 9717 scope.$apply(function () {
9706   - scope.IdentityClick();
  9718 + scope.IdentifyClick();
9707 9719 });
9708 9720 }
9709 9721  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @21cb7f5
... ... @@ -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">
... ...