ADAM / AIAHTML5

Commit 5dc6c30de7cbe4953590484fe7c50c4b28020c26

Authored by Amrita Vishnoi
1 parent 22292e83

Bug#22485_1 merged

Inline Side-by-side
Showing 1 changed file with 27 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @5dc6c30
... ... @@ -2813,9 +2813,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2813 2813  
2814 2814 $scope.HighlightBodyByTermListForBodySystem = function (TermList) {
2815 2815  
  2816 + $scope.isScrolledToHighlightedBR = false;
2816 2817 //disable the background till the system gets highlighted.
2817 2818 document.getElementById("daView").style.pointerEvents="none";
2818   -
  2819 + $('.ui-slider').slider('disable');
2819 2820 $("#btnTranparency").attr('disabled', 'disabled');
2820 2821 $scope.currentLayerNumber = $scope.layerNumber;
2821 2822  
... ... @@ -2870,7 +2871,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2870 2871 $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
2871 2872 $("#daMessageModal").modal('show');
2872 2873 document.getElementById("daView").style.pointerEvents = "auto";
2873   -
  2874 + $('.ui-slider').slider('enable');
2874 2875 }
2875 2876 else {
2876 2877 console.log('1. HighlightBodyByTermListForBodySystem is called');
... ... @@ -3047,9 +3048,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3047 3048 $rootScope.isLoading = false;
3048 3049  
3049 3050 document.getElementById("daView").style.pointerEvents = "auto";
3050   -
  3051 + $('.ui-slider').slider('enable');
3051 3052  
3052 3053 prevBRID = TermExistInBodyRegionId;
  3054 +
  3055 + $scope.scrollToHighlightedBodyRegion(TermExistInBodyRegionId);
3053 3056 })
3054 3057 }
3055 3058 }
... ... @@ -3058,7 +3061,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3058 3061 $('#spinner').css('visibility', 'hidden')
3059 3062 $rootScope.isLoading = false;
3060 3063 document.getElementById("daView").style.pointerEvents = "auto";
3061   -
  3064 + $('.ui-slider').slider('enable');
3062 3065 }
3063 3066  
3064 3067 })
... ... @@ -3078,6 +3081,26 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3078 3081 }
3079 3082  
3080 3083  
  3084 + $scope.scrollToHighlightedBodyRegion = function(TermExistInBodyRegionId){
  3085 + if ($scope.isScrolledToHighlightedBR == false) {
  3086 +
  3087 + $scope.bodyRegionCoordinates = new jinqJs()
  3088 + .from($rootScope.BodyRegionData.BodyRegionViews.BodyRegionCordinates)
  3089 + .where('_ViewOrientationId == ' + $rootScope.viewOrientationId)
  3090 + .select();
  3091 +
  3092 + $scope.TermExistInBodyRegionData = new jinqJs()
  3093 + .from($scope.bodyRegionCoordinates)
  3094 + .where('_BodyRegionId == ' + TermExistInBodyRegionId)
  3095 + .select();
  3096 +
  3097 + var rectangle = scaleRectangle($scope.TermExistInBodyRegionData[0]._X, $scope.TermExistInBodyRegionData[0]._Y, $scope.TermExistInBodyRegionData[0]._Height, $scope.TermExistInBodyRegionData[0]._Width, $scope.TermExistInBodyRegionData[0]._MirrorValue);
  3098 +
  3099 + $('#canvasDiv').scrollTop(rectangle.scaledY);
  3100 + $scope.isScrolledToHighlightedBR = true;
  3101 + }
  3102 + }
  3103 +
3081 3104 $scope.createTermListByPreviousTermsAndHighlight = function () {
3082 3105  
3083 3106  
... ...