ADAM / AIAHTML5

Commit a196a6fb27aa808944a3699181551452066cbb60

Authored by Nikita Kulshreshtha
1 parent bf046893

scrolled to the previous posituion

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