ADAM / AIAHTML5

Commit 78970abc401f545c1f3892e450da1e58bcd0faf6

Authored by unknown
1 parent fad8a339

30499 : Atlas Anatomy > All Pins are not appeared on the body system even after … 

…selecting the Body System: All
Inline Side-by-side
Showing 1 changed file with 9 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @78970ab
... ... @@ -516,6 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
516 516 $rootScope.aaPinDataArray = [];
517 517 $rootScope.isShowSelectedSystemPinsClicked = false;
518 518 $scope.showAllPins = function () {
  519 +
519 520 $scope.allPinDataArray = [];
520 521 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
521 522 .then(
... ... @@ -530,7 +531,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
530 531 document.getElementById('navigatorDiv').style.visibility = 'hidden';
531 532  
532 533 }
  534 +
533 535 //draw pins
  536 +
  537 +
534 538 $scope.aaPinData = result.data.Root.Item;
535 539 if ($scope.aaPinData != null && $scope.aaPinData.length > 0) {
536 540 $rootScope.aaPinDataArray = $scope.aaPinData
... ... @@ -771,7 +775,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
771 775 $scope.isBodySystemSelected = false;
772 776 $scope.SelectedSystemTitle = "Current Structure";
773 777 $scope.showSelectedSystemPins = function (event) {
774   -
  778 +
775 779 if (typeof event == "object") {
776 780 if (event.currentTarget.title == $("#bodySystemList li.activeAASystemSelect a").attr("title")) {
777 781  
... ... @@ -809,6 +813,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
809 813 $scope.showAllPinsAfterHide();
810 814 }
811 815 else {
  816 + //#30499 : Atlas Anatomy > All Pins are not appeared on the body system even after selecting the Body System: All
  817 + $('#aaDetailViewCanvas').removeLayers();
812 818 $scope.showAllPins();
813 819 }
814 820 }
... ... @@ -839,7 +845,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
839 845 if ($scope.selectedSystemPinData != null && $scope.selectedSystemPinData.length > 0) {
840 846  
841 847 angular.forEach($scope.aaPinData, function (aaPinDataValue, aaPinDataKey) {
842   -
  848 +
843 849 if (aaPinDataValue._BodySystemName != $scope.selectedSystemName)
844 850 {
845 851 $scope.removePin('aaDetailViewCanvas', aaPinDataValue._PinId);
... ... @@ -1384,7 +1390,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1384 1390  
1385 1391  
1386 1392 $scope.drawStaticPinsOnImage = function (canvasId, PinId, offsetX1, offsetY1, x, y) {
1387   -
  1393 +
1388 1394 //if ($scope.isSearchOptionClicked == true) {
1389 1395 // $scope.clickedPins = [];
1390 1396 // $scope.isSearchOptionClicked = false;
... ...