Commit 7c389eecd9ed5a5a5993563b4dff24916669c1ef
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationToolIdentity
Showing
1 changed file
with
90 additions
and
83 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -438,23 +438,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -438,23 +438,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
438 | } | 438 | } |
439 | 439 | ||
440 | // 0.2 getting corresponding body view title | 440 | // 0.2 getting corresponding body view title |
441 | - var counter = 1; | 441 | + //var counter = 1; |
442 | var tittle = localStorage.getItem("currentViewTitleFromJson"); | 442 | var tittle = localStorage.getItem("currentViewTitleFromJson"); |
443 | + localStorage.setItem("currentViewTitle", tittle); | ||
443 | 444 | ||
444 | - if (openViews != null && openViews != undefined) { | ||
445 | - angular.forEach(openViews, function (value, key) { | 445 | + //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD |
446 | + //if (openViews != null && openViews != undefined) { | ||
447 | + // angular.forEach(openViews, function (value, key) { | ||
446 | 448 | ||
447 | - if (value.bodyView == tittle) { | ||
448 | - tittle = localStorage.getItem("currentViewTitleFromJson") + counter++; | ||
449 | - $rootScope.currentActiveViewTitle = tittle; | ||
450 | - localStorage.setItem("currentViewTitle", tittle); | ||
451 | - } | 449 | + // if (value.bodyView == tittle) { |
450 | + // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++; | ||
451 | + // $rootScope.currentActiveViewTitle = tittle; | ||
452 | + // localStorage.setItem("currentViewTitle", tittle); | ||
453 | + // } | ||
452 | 454 | ||
453 | - }); | ||
454 | - } | ||
455 | - else { | ||
456 | - localStorage.setItem("currentViewTitle", tittle); | ||
457 | - } | 455 | + // }); |
456 | + //} | ||
457 | + //else { | ||
458 | + // localStorage.setItem("currentViewTitle", tittle); | ||
459 | + //} | ||
458 | 460 | ||
459 | //0.3 | 461 | //0.3 |
460 | 462 | ||
@@ -468,6 +470,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -468,6 +470,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
468 | url: 'app/views/da/da-view.html' | 470 | url: 'app/views/da/da-view.html' |
469 | }, | 471 | }, |
470 | title: localStorage.getItem("currentViewTitle"), | 472 | title: localStorage.getItem("currentViewTitle"), |
473 | + | ||
471 | position: { | 474 | position: { |
472 | top: 70, | 475 | top: 70, |
473 | left: 1, | 476 | left: 1, |
@@ -735,6 +738,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -735,6 +738,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
735 | //calculate coordinates for body region images | 738 | //calculate coordinates for body region images |
736 | $scope.CalculateImageCordinates = function (viewOrientationId) { | 739 | $scope.CalculateImageCordinates = function (viewOrientationId) { |
737 | 740 | ||
741 | + $rootScope.isLoading = true; | ||
742 | + $('#spinner').css('visibility', 'visible'); | ||
743 | + | ||
738 | // annotation toolbar canvas | 744 | // annotation toolbar canvas |
739 | if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) { | 745 | if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) { |
740 | 746 | ||
@@ -744,6 +750,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -744,6 +750,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
744 | 750 | ||
745 | } | 751 | } |
746 | 752 | ||
753 | + | ||
754 | + | ||
747 | $scope.terminateCurrentlyRunningWPs(); | 755 | $scope.terminateCurrentlyRunningWPs(); |
748 | 756 | ||
749 | var drawnBodyRegionCount = []; | 757 | var drawnBodyRegionCount = []; |
@@ -948,8 +956,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -948,8 +956,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
948 | 956 | ||
949 | }); | 957 | }); |
950 | 958 | ||
951 | - $rootScope.isLoading = false; | ||
952 | - $('#spinner').css('visibility', 'hidden'); | 959 | + //$rootScope.isLoading = false; |
960 | + //$('#spinner').css('visibility', 'hidden'); | ||
953 | } | 961 | } |
954 | 962 | ||
955 | if (($rootScope.globalSetting.modesty == 'Y')) { | 963 | if (($rootScope.globalSetting.modesty == 'Y')) { |
@@ -1205,6 +1213,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1205,6 +1213,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1205 | 1213 | ||
1206 | $scope.DrawMirroredImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) { | 1214 | $scope.DrawMirroredImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) { |
1207 | 1215 | ||
1216 | + $rootScope.isLoading = true; | ||
1217 | + $('#spinner').css('visibility', 'visible'); | ||
1218 | + | ||
1208 | var FlipedImgCanvas = document.createElement('canvas'); | 1219 | var FlipedImgCanvas = document.createElement('canvas'); |
1209 | FlipedImgCanvas.height = h; | 1220 | FlipedImgCanvas.height = h; |
1210 | FlipedImgCanvas.width = w; | 1221 | FlipedImgCanvas.width = w; |
@@ -1532,6 +1543,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1532,6 +1543,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1532 | //}, 500); | 1543 | //}, 500); |
1533 | } | 1544 | } |
1534 | } | 1545 | } |
1546 | + else { | ||
1547 | + $rootScope.isLoading = false; | ||
1548 | + $('#spinner').css('visibility', 'hidden'); | ||
1549 | + } | ||
1535 | } | 1550 | } |
1536 | 1551 | ||
1537 | // console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); | 1552 | // console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); |
@@ -1564,6 +1579,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1564,6 +1579,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1564 | 1579 | ||
1565 | $scope.DrawImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) { | 1580 | $scope.DrawImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) { |
1566 | 1581 | ||
1582 | + $rootScope.isLoading = true; | ||
1583 | + $('#spinner').css('visibility', 'visible'); | ||
1584 | + | ||
1567 | var imgCanvas = document.createElement('canvas'); | 1585 | var imgCanvas = document.createElement('canvas'); |
1568 | 1586 | ||
1569 | imgCanvas.height = h; | 1587 | imgCanvas.height = h; |
@@ -1895,6 +1913,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1895,6 +1913,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1895 | 1913 | ||
1896 | } | 1914 | } |
1897 | } | 1915 | } |
1916 | + else { | ||
1917 | + $rootScope.isLoading = false; | ||
1918 | + $('#spinner').css('visibility', 'hidden'); | ||
1919 | + } | ||
1898 | } | 1920 | } |
1899 | 1921 | ||
1900 | console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); | 1922 | console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); |
@@ -1969,6 +1991,26 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1969,6 +1991,26 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1969 | var CallBackBodyRegion = []; | 1991 | var CallBackBodyRegion = []; |
1970 | var selectedAnnotation; | 1992 | var selectedAnnotation; |
1971 | 1993 | ||
1994 | + if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0) && $rootScope.isListManagerSelected) { | ||
1995 | + | ||
1996 | + multiTermList = $scope.AllTerms; | ||
1997 | + angular.forEach($rootScope.previousHighlightList, function (value, key) { | ||
1998 | + | ||
1999 | + var ActualTermNo = $scope.getActualTermNumber(value); | ||
2000 | + selectedAnnotation = ActualTermNo; | ||
2001 | + if (ActualTermNo != null) { | ||
2002 | + var TermList = $scope.getTermNumberList(ActualTermNo); | ||
2003 | + if (TermList != null) { | ||
2004 | + for (var i = 0; i < TermList.length; i++) { | ||
2005 | + multiTermList.push(TermList[i]); | ||
2006 | + } | ||
2007 | + } | ||
2008 | + } | ||
2009 | + | ||
2010 | + // to do | ||
2011 | + }); | ||
2012 | + } | ||
2013 | + | ||
1972 | if ($rootScope.isListManagerSelected) { | 2014 | if ($rootScope.isListManagerSelected) { |
1973 | 2015 | ||
1974 | multiTermList = $scope.AllTerms; | 2016 | multiTermList = $scope.AllTerms; |
@@ -2165,7 +2207,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2165,7 +2207,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2165 | $scope.aligneCanvasWithTerm() | 2207 | $scope.aligneCanvasWithTerm() |
2166 | } | 2208 | } |
2167 | 2209 | ||
2168 | - $timeout(function () { $scope.DisableProgressBar() }, 1000); | 2210 | + // $timeout(function () { $scope.DisableProgressBar() }, 1000); |
2169 | 2211 | ||
2170 | 2212 | ||
2171 | 2213 | ||
@@ -2399,16 +2441,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2399,16 +2441,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2399 | 2441 | ||
2400 | if ($scope.doAligneCanvasWithTerm == true) { | 2442 | if ($scope.doAligneCanvasWithTerm == true) { |
2401 | 2443 | ||
2402 | - if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true) | 2444 | + if ($rootScope.isListManagerSelected == true) |
2445 | + $scope.aligneCanvasWithTerm(); | ||
2446 | + | ||
2447 | + else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true) { | ||
2403 | 2448 | ||
2404 | $rootScope.isLoading = false; | 2449 | $rootScope.isLoading = false; |
2405 | 2450 | ||
2406 | - $('#spinner').css('visibility', 'hidden'); | 2451 | + $('#spinner').css('visibility', 'hidden'); |
2452 | + } | ||
2407 | 2453 | ||
2408 | // $rootScope.isHighlightBodyByBodySystem = false; | 2454 | // $rootScope.isHighlightBodyByBodySystem = false; |
2409 | 2455 | ||
2410 | - if ($rootScope.isListManagerSelected == true) | ||
2411 | - $scope.aligneCanvasWithTerm(); | 2456 | + |
2412 | } | 2457 | } |
2413 | } | 2458 | } |
2414 | // | 2459 | // |
@@ -5018,56 +5063,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5018,56 +5063,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5018 | 5063 | ||
5019 | $scope.flushCanvas = function () { | 5064 | $scope.flushCanvas = function () { |
5020 | 5065 | ||
5021 | - //if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) { | ||
5022 | - // angular.forEach($scope.ColoredImageSRC, function (value, key) { | ||
5023 | 5066 | ||
5024 | - // var id; | ||
5025 | - // var maskId; | ||
5026 | - // if (value.haveMirror == 'true') { | ||
5027 | - // id = 'imageCanvas' + value.bodyRegionId + '_MR'; | ||
5028 | - // maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci' | ||
5029 | - // } | ||
5030 | - // else { | ||
5031 | - // id = 'imageCanvas' + value.bodyRegionId; | ||
5032 | - // maskId = 'imageCanvas' + value.bodyRegionId + '_mci'; | ||
5033 | - // } | ||
5034 | - | ||
5035 | - // var canvas = document.getElementById(id); | ||
5036 | - // if (canvas != null || canvas != undefined) { | ||
5037 | - // document.getElementById('canvasDiv').removeChild(canvas); | ||
5038 | - // } | ||
5039 | - | ||
5040 | - // var maskcanvas = document.getElementById(maskId); | ||
5041 | - // if (maskcanvas != null || maskcanvas != undefined) { | ||
5042 | - // document.getElementById('canvasDiv').removeChild(maskcanvas); | 5067 | + $rootScope.isLoading = true; |
5068 | + $('#spinner').css('visibility', 'visible'); | ||
5043 | 5069 | ||
5044 | - // } | ||
5045 | - // if (i == 4 || i == 5 || i == 6) { | ||
5046 | - // id = 'imageCanvas' + i + '_MR'; | ||
5047 | - // maskId = 'imageCanvas' + i + '_MR_mci'; | ||
5048 | - | ||
5049 | - // var canvas = document.getElementById(id); | ||
5050 | - // if (canvas != null || canvas != undefined) | ||
5051 | - // document.getElementById('canvasDiv').removeChild(canvas); | ||
5052 | - | ||
5053 | - // var maskcanvas = document.getElementById(maskId); | ||
5054 | - // if (maskcanvas != null || maskcanvas != undefined) | ||
5055 | - // document.getElementById('canvasDiv').removeChild(maskcanvas); | ||
5056 | - // } | ||
5057 | - | ||
5058 | - // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); | ||
5059 | - // for (var i = 0; i < modestyCanvases.length; i++) { | ||
5060 | - // modestyCanvases[i].remove(); | ||
5061 | - // } | ||
5062 | - // }); | ||
5063 | - // //remove modesty canavs | ||
5064 | - // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); | ||
5065 | - // if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) { | ||
5066 | - // for (var j = 0; j < modestyCanvases.length; j++) { | ||
5067 | - // modestyCanvases[j].remove(); | ||
5068 | - // } | ||
5069 | - // } | ||
5070 | - //} | ||
5071 | var endIndex = 0; | 5070 | var endIndex = 0; |
5072 | var startIndex = 0; | 5071 | var startIndex = 0; |
5073 | if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { | 5072 | if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { |
@@ -5123,7 +5122,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5123,7 +5122,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5123 | var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); | 5122 | var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); |
5124 | if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) { | 5123 | if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) { |
5125 | for (var j = 0; j < modestyCanvases.length; j++) { | 5124 | for (var j = 0; j < modestyCanvases.length; j++) { |
5126 | - modestyCanvases[j].remove(); | 5125 | + |
5126 | + modestyCanvases[j].parentNode.removeChild(modestyCanvases[j]); | ||
5127 | } | 5127 | } |
5128 | } | 5128 | } |
5129 | } | 5129 | } |
@@ -5625,9 +5625,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5625,9 +5625,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5625 | if ($scope.isEligibleForHighlightBodyByTermList == true) { | 5625 | if ($scope.isEligibleForHighlightBodyByTermList == true) { |
5626 | //DISABLE PROGERSS BAR FOR GENDER OR VIEW CHANGE | 5626 | //DISABLE PROGERSS BAR FOR GENDER OR VIEW CHANGE |
5627 | // if ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true) { | 5627 | // if ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true) { |
5628 | - $scope.isLoading = false; | 5628 | + //$scope.isLoading = false; |
5629 | 5629 | ||
5630 | - $('#spinner').css('visibility', 'hidden'); | 5630 | + //$('#spinner').css('visibility', 'hidden'); |
5631 | //} | 5631 | //} |
5632 | 5632 | ||
5633 | if (($rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { | 5633 | if (($rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { |
@@ -5929,7 +5929,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5929,7 +5929,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5929 | var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId]; | 5929 | var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId]; |
5930 | 5930 | ||
5931 | 5931 | ||
5932 | - if ((event.currentTarget.attributes[1].value == 'Male') && (localStorage.getItem("genderId") == 'Female')) { | 5932 | + if ((event.currentTarget.title == 'Male') && (localStorage.getItem("genderId") == 'Female')) { |
5933 | 5933 | ||
5934 | //1. | 5934 | //1. |
5935 | localStorage.setItem("genderId", 'Male'); | 5935 | localStorage.setItem("genderId", 'Male'); |
@@ -5961,7 +5961,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5961,7 +5961,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5961 | 5961 | ||
5962 | } | 5962 | } |
5963 | 5963 | ||
5964 | - else if ((event.currentTarget.attributes[1].value == 'Female') && (localStorage.getItem("genderId") == 'Male')) { | 5964 | + else if ((event.currentTarget.title == 'Female') && (localStorage.getItem("genderId") == 'Male')) { |
5965 | 5965 | ||
5966 | //1. | 5966 | //1. |
5967 | localStorage.setItem("genderId", 'Female'); | 5967 | localStorage.setItem("genderId", 'Female'); |
@@ -6145,7 +6145,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6145,7 +6145,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6145 | 6145 | ||
6146 | $scope.layerNumber = 0; | 6146 | $scope.layerNumber = 0; |
6147 | // debugger; | 6147 | // debugger; |
6148 | - var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value]; | 6148 | + //var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value]; |
6149 | + var selectedViewId = $scope.bodyViews[event.currentTarget.title]; | ||
6150 | + | ||
6149 | $rootScope.viewOrientationId = selectedViewId; | 6151 | $rootScope.viewOrientationId = selectedViewId; |
6150 | if (localStorage.getItem("genderId") == 'Male') { | 6152 | if (localStorage.getItem("genderId") == 'Male') { |
6151 | if ($rootScope.voId != selectedViewId) { | 6153 | if ($rootScope.voId != selectedViewId) { |
@@ -6210,8 +6212,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6210,8 +6212,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6210 | // $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + $scope.bodyViews[event.currentTarget.attributes[1].value; | 6212 | // $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + $scope.bodyViews[event.currentTarget.attributes[1].value; |
6211 | 6213 | ||
6212 | } | 6214 | } |
6213 | - $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + event.currentTarget.attributes[1].value; | ||
6214 | - localStorage.setItem("currentViewTitle", localStorage.getItem("genderId") + " " + event.currentTarget.attributes[1].value); | 6215 | + $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + event.currentTarget.title; |
6216 | + localStorage.setItem("currentViewTitle", localStorage.getItem("genderId") + " " + event.currentTarget.title); | ||
6215 | 6217 | ||
6216 | 6218 | ||
6217 | $rootScope.openViews.push( | 6219 | $rootScope.openViews.push( |
@@ -6977,7 +6979,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6977,7 +6979,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6977 | 6979 | ||
6978 | 6980 | ||
6979 | for (var j = 0; j < $scope.VocabTermTxt.length; j++) { | 6981 | for (var j = 0; j < $scope.VocabTermTxt.length; j++) { |
6980 | - var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList') | 6982 | + var $el = $('<option title ="'+ $scope.VocabTermTxt[j]._TermText+ '" ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList') |
6981 | $compile($el)($scope); | 6983 | $compile($el)($scope); |
6982 | 6984 | ||
6983 | } | 6985 | } |
@@ -7003,6 +7005,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7003,6 +7005,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7003 | $('#spinner').css('visibility', 'hidden'); | 7005 | $('#spinner').css('visibility', 'hidden'); |
7004 | } | 7006 | } |
7005 | else { | 7007 | else { |
7008 | + | ||
7009 | + $rootScope.isLoading = true; | ||
7010 | + | ||
7011 | + $('#spinner').css('visibility', 'visible'); | ||
7012 | + | ||
7013 | + | ||
7006 | $rootScope.prevId = event.currentTarget.id; | 7014 | $rootScope.prevId = event.currentTarget.id; |
7007 | $("#termList").find("option").attr('selected', false); | 7015 | $("#termList").find("option").attr('selected', false); |
7008 | $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | 7016 | $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); |
@@ -7025,10 +7033,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7025,10 +7033,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7025 | } | 7033 | } |
7026 | } | 7034 | } |
7027 | //--- | 7035 | //--- |
7028 | - $rootScope.isLoading = true; | ||
7029 | - | ||
7030 | - $('#spinner').css('visibility', 'visible'); | ||
7031 | - | 7036 | + |
7032 | $rootScope.isHighlightBodyByBodySystem = false; | 7037 | $rootScope.isHighlightBodyByBodySystem = false; |
7033 | 7038 | ||
7034 | //1. | 7039 | //1. |
@@ -7134,8 +7139,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7134,8 +7139,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7134 | 7139 | ||
7135 | //8.remove current layer canavses | 7140 | //8.remove current layer canavses |
7136 | $scope.flushCanvas(); | 7141 | $scope.flushCanvas(); |
7137 | - | ||
7138 | - | 7142 | + |
7139 | 7143 | ||
7140 | //9. | 7144 | //9. |
7141 | $timeout(function () { | 7145 | $timeout(function () { |
@@ -7150,6 +7154,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7150,6 +7154,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7150 | //DA > Annotation's Line should not displayed. | 7154 | //DA > Annotation's Line should not displayed. |
7151 | $("#bord").css("display", "none"); | 7155 | $("#bord").css("display", "none"); |
7152 | 7156 | ||
7157 | + $rootScope.isLoading = true; | ||
7158 | + $('#spinner').css('visibility', 'visible'); | ||
7159 | + | ||
7153 | //redraw body of respective layer | 7160 | //redraw body of respective layer |
7154 | $scope.CalculateImageCordinates($rootScope.viewOrientationId) | 7161 | $scope.CalculateImageCordinates($rootScope.viewOrientationId) |
7155 | }, 500); | 7162 | }, 500); |