ADAM / AIAHTML5

Commit 0cf4a049776011d8064a9a25acd3523019abe2ec

Authored by Amrita Vishnoi
2 parents e0e9a263 a196a6fb

Merge branch 'Bug#10034' into Develop

Inline Side-by-side
Showing 1 changed file with 29 additions and 12 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @0cf4a04
@@ -2225,16 +2225,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2225,16 +2225,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2225 } 2225 }
2226 2226
2227 $scope.HighlightBodyByTermList = function (TermList) { 2227 $scope.HighlightBodyByTermList = function (TermList) {
2228 -  
2229 - //if (($rootScope.updatedGrayMRDataList != null || $rootScope.updatedGrayMRDataList != undefined) && $rootScope.updatedGrayMRDataList.length > 0) {  
2230 - // $rootScope.updatedGrayMRDataList = null;  
2231 - // $rootScope.updatedGrayMRDataList = [];  
2232 - //}  
2233 - //if (($rootScope.updatedGrayDataList != null || $rootScope.updatedGrayDataList != undefined) && $rootScope.updatedGrayDataList.length > 0) {  
2234 - // $rootScope.updatedGrayDataList = null;  
2235 - // $rootScope.updatedGrayDataList = [];  
2236 - //}  
2237 - 2228 +
2238 $scope.layerNumber = $('#txtlayerNumber').val(); 2229 $scope.layerNumber = $('#txtlayerNumber').val();
2239 2230
2240 $rootScope.isLoading = true; 2231 $rootScope.isLoading = true;
@@ -2451,6 +2442,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2451,6 +2442,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2451 2442
2452 $('#spinner').css('visibility', 'hidden'); 2443 $('#spinner').css('visibility', 'hidden');
2453 } 2444 }
  2445 + else {
  2446 + var canvasDiv = document.getElementById('canvasDiv');
  2447 + $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
  2448 + $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
  2449 +
  2450 + $rootScope.isLoading = false;
  2451 +
  2452 + $('#spinner').css('visibility', 'hidden');
  2453 + //$('#canvasDiv').scrollLeft(newX);
  2454 + //$('#canvasDiv').scrollTop(newY);
  2455 + }
2454 2456
2455 // $rootScope.isHighlightBodyByBodySystem = false; 2457 // $rootScope.isHighlightBodyByBodySystem = false;
2456 2458
@@ -5898,7 +5900,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5898,7 +5900,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5898 5900
5899 $scope.OnGenderChange = function (event) { 5901 $scope.OnGenderChange = function (event) {
5900 5902
5901 - 5903 + var canvasDiv = document.getElementById('canvasDiv');
  5904 + $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
  5905 + $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
5902 5906
5903 $("#btnExtract").removeClass("disabled"); 5907 $("#btnExtract").removeClass("disabled");
5904 $("#btnTranparency").removeClass("disabled"); 5908 $("#btnTranparency").removeClass("disabled");
@@ -5923,6 +5927,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5923,6 +5927,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5923 if ($rootScope.isExtract == true) { 5927 if ($rootScope.isExtract == true) {
5924 $rootScope.isExtract = false; 5928 $rootScope.isExtract = false;
5925 $rootScope.isHighLight = true; 5929 $rootScope.isHighLight = true;
  5930 + $("#btnExtract").removeClass("btn-primary");
  5931 + $("#btnExtract").addClass("btn-black");
  5932 + $("#btnHighLight").removeClass("btn-black");
  5933 + $("#btnHighLight").addClass("btn-primary");
  5934 +
  5935 +
5926 } 5936 }
5927 5937
5928 5938
@@ -6115,6 +6125,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6115,6 +6125,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6115 6125
6116 $scope.OnViewChange = function (event) { 6126 $scope.OnViewChange = function (event) {
6117 6127
  6128 + var canvasDiv = document.getElementById('canvasDiv');
  6129 + $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
  6130 + $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
6118 6131
6119 $("#btnExtract").removeClass("disabled"); 6132 $("#btnExtract").removeClass("disabled");
6120 $("#btnTranparency").removeClass("disabled"); 6133 $("#btnTranparency").removeClass("disabled");
@@ -6142,8 +6155,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6142,8 +6155,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6142 if ($rootScope.isExtract == true) { 6155 if ($rootScope.isExtract == true) {
6143 $rootScope.isExtract = false; 6156 $rootScope.isExtract = false;
6144 $rootScope.isHighLight = true; 6157 $rootScope.isHighLight = true;
  6158 + $("#btnExtract").removeClass("btn-primary");
  6159 + $("#btnExtract").addClass("btn-black");
  6160 + $("#btnHighLight").removeClass("btn-black");
  6161 + $("#btnHighLight").addClass("btn-primary");
6145 } 6162 }
6146 - 6163 +
6147 $scope.layerNumber = 0; 6164 $scope.layerNumber = 0;
6148 // debugger; 6165 // debugger;
6149 //var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value]; 6166 //var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value];