Commit 4ee8111d3d8b0cadb4ae5ddfa787a472a4ddce79
1 parent
6a859856
24918 : Atlas Anatomy > List Manager > The selected pin highlight goes away when…
… zoom-in/zoom-out the slider.
Showing
1 changed file
with
35 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -291,6 +291,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -291,6 +291,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
291 | range: "min", | 291 | range: "min", |
292 | orientation: "vertical", | 292 | orientation: "vertical", |
293 | slide: function (event, ui) { | 293 | slide: function (event, ui) { |
294 | + | ||
294 | var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); | 295 | var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); |
295 | scope.$apply(function () { | 296 | scope.$apply(function () { |
296 | scope.sliderVal = ui.value; | 297 | scope.sliderVal = ui.value; |
@@ -298,6 +299,27 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -298,6 +299,27 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
298 | var relativeWidth = 0; | 299 | var relativeWidth = 0; |
299 | var relativeHeight = 0; | 300 | var relativeHeight = 0; |
300 | if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) { | 301 | if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) { |
302 | + $("#listManager").css("display", "none"); | ||
303 | + $("#optionsListManagerTab").removeClass("active"); | ||
304 | + //make the head green | ||
305 | + | ||
306 | + setTimeout(function () { | ||
307 | + | ||
308 | + var radialAfterClick = $('#aaDetailViewCanvas').createGradient({ | ||
309 | + x1: 50, y1: 50, | ||
310 | + x2: 50, y2: 50, | ||
311 | + r1: 10, r2: 30, | ||
312 | + c1: 'rgba(100, 50, 0,0)', | ||
313 | + c2: 'rgb(126, 187, 83)' | ||
314 | + }); | ||
315 | + for (var i = 0; i <= scope.listMangerID.length - 1; i++) { | ||
316 | + $('#aaDetailViewCanvas').setLayer(scope.listMangerID[i], { | ||
317 | + fillStyle: radialAfterClick, | ||
318 | + }).drawLayers(); | ||
319 | + } | ||
320 | + | ||
321 | + }, 1000); | ||
322 | + | ||
301 | if (ui.value == 100) { | 323 | if (ui.value == 100) { |
302 | relativeWidth = scope.ViewImageWidth; | 324 | relativeWidth = scope.ViewImageWidth; |
303 | relativeHeight = scope.ViewImageHeight | 325 | relativeHeight = scope.ViewImageHeight |
@@ -784,14 +806,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -784,14 +806,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
784 | 806 | ||
785 | } | 807 | } |
786 | } | 808 | } |
787 | - | 809 | + $scope.listMangerID = []; |
788 | $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) { | 810 | $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) { |
789 | $scope.clickedPins = []; | 811 | $scope.clickedPins = []; |
790 | $scope.selectedPin = []; | 812 | $scope.selectedPin = []; |
791 | var isSameTermWithMultiPin = false; | 813 | var isSameTermWithMultiPin = false; |
792 | var firstPinId = selectedPinData[0]._PinId; | 814 | var firstPinId = selectedPinData[0]._PinId; |
793 | var pinTermNumber = selectedPinData[0]._TermId; | 815 | var pinTermNumber = selectedPinData[0]._TermId; |
794 | - | 816 | + |
795 | //check if other pin have same termNumber | 817 | //check if other pin have same termNumber |
796 | if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { | 818 | if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { |
797 | 819 | ||
@@ -799,7 +821,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -799,7 +821,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
799 | .from($scope.aaPinData) | 821 | .from($scope.aaPinData) |
800 | .where("_TermId == " + pinTermNumber) | 822 | .where("_TermId == " + pinTermNumber) |
801 | .select(); | 823 | .select(); |
802 | - | 824 | + console.log(pinDataWithFirstTermNumber); |
825 | + $scope.listMangerID = []; | ||
826 | + for (var i = 0; i <= pinDataWithFirstTermNumber.length - 1; i++) { | ||
827 | + $scope.listMangerID.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId); | ||
828 | + } | ||
829 | + console.log($scope.listMangerID); | ||
803 | $scope.MultiLanguageAnnationArray = []; | 830 | $scope.MultiLanguageAnnationArray = []; |
804 | 831 | ||
805 | $scope.GetAnnotationBasedOnActualTermNo(pinTermNumber); | 832 | $scope.GetAnnotationBasedOnActualTermNo(pinTermNumber); |
@@ -1203,6 +1230,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1203,6 +1230,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1203 | radius: 5 * $scope.sliderPercentValue, | 1230 | radius: 5 * $scope.sliderPercentValue, |
1204 | 1231 | ||
1205 | click: function (clickedPin) { | 1232 | click: function (clickedPin) { |
1233 | + | ||
1206 | if (clickedPin.event.ctrlKey == false) { | 1234 | if (clickedPin.event.ctrlKey == false) { |
1207 | $scope.clickedPins = []; | 1235 | $scope.clickedPins = []; |
1208 | } | 1236 | } |
@@ -1749,7 +1777,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1749,7 +1777,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1749 | } | 1777 | } |
1750 | 1778 | ||
1751 | $scope.highlightPinBasedOnSerachItem = function (id) { | 1779 | $scope.highlightPinBasedOnSerachItem = function (id) { |
1752 | - | ||
1753 | $scope.searchItemId = id; | 1780 | $scope.searchItemId = id; |
1754 | $scope.searchItemText = $("#" + id).text(); | 1781 | $scope.searchItemText = $("#" + id).text(); |
1755 | $rootScope.searchSelectedText = $("#" + id).text(); | 1782 | $rootScope.searchSelectedText = $("#" + id).text(); |
@@ -1778,6 +1805,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1778,6 +1805,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1778 | $("#canvasDiv").scrollTop(annotationTopPos[0]); | 1805 | $("#canvasDiv").scrollTop(annotationTopPos[0]); |
1779 | 1806 | ||
1780 | $scope.IsSearchVisible = false; | 1807 | $scope.IsSearchVisible = false; |
1808 | + | ||
1809 | + | ||
1810 | + | ||
1811 | + | ||
1781 | } | 1812 | } |
1782 | 1813 | ||
1783 | $rootScope.isShowHideButtonClicked = true; | 1814 | $rootScope.isShowHideButtonClicked = true; |