Commit 6e1c91bd567b8e7c4de30f67c272b25070984897
1 parent
1260f707
AASelectedPinIssue bracnch is merged
Showing
1 changed file
with
4 additions
and
91 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... | ... | @@ -951,7 +951,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
951 | 951 | click: function (clickedPin) { |
952 | 952 | // alert('pin clciked = ' + clickedPin.name) |
953 | 953 | |
954 | - | |
954 | + if (clickedPin.event.ctrlKey == false) { | |
955 | + $scope.clickedPins = []; | |
956 | + } | |
955 | 957 | |
956 | 958 | var pinID = (clickedPin.name).substring(7, (clickedPin.name).length); |
957 | 959 | // alert('pinId: ' + pinID); |
... | ... | @@ -1031,96 +1033,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
1031 | 1033 | } |
1032 | 1034 | |
1033 | 1035 | }).drawLayers(); |
1034 | - //} | |
1035 | - // else | |
1036 | - // { | |
1037 | - // var radial = $('#' + canvasId).createGradient({ | |
1038 | - // x1: 50, y1: 50, | |
1039 | - // x2: 50, y2: 50, | |
1040 | - // r1: 10, r2: 30, | |
1041 | - // c1: 'rgba(100, 50, 0,0)', | |
1042 | - // c2: 'rgb(216, 216, 216)' | |
1043 | - // }); | |
1044 | - // $('#' + canvasId).drawLine({ | |
1045 | - | |
1046 | - // layer: true, | |
1047 | - // name: "Pin_" + PinId, | |
1048 | - // groups: ["Pin_" + PinId], | |
1049 | - // strokeStyle: 'black', | |
1050 | - // strokeWidth: 2, | |
1051 | - // visible: true, | |
1052 | - // x1: offsetX1, y1: offsetY1, | |
1053 | - // x2: x, y2: y, | |
1054 | - | |
1055 | - // }).drawArc({ | |
1056 | - // name: "PinArc_" + PinId, | |
1057 | - // layer: true, | |
1058 | - // groups: ["Pin_" + PinId], | |
1059 | - // strokeStyle: 'grey', | |
1060 | - // strokeWidth: 2, | |
1061 | - // visible: true, | |
1062 | - // fillStyle: radial, | |
1063 | - // x: x, y: y, | |
1064 | - // radius: 5, | |
1065 | - | |
1066 | - // click: function (clickedPin) { | |
1067 | - // alert('pin clciked = ' + clickedPin.name) //change the head color to green | |
1068 | - // var radialAfterClick = $('#aaDetailViewCanvas').createGradient({ | |
1069 | - // x1: 50, y1: 50, | |
1070 | - // x2: 50, y2: 50, | |
1071 | - // r1: 10, r2: 30, | |
1072 | - // c1: 'rgba(100, 50, 0,0)', | |
1073 | - // c2: 'rgb(126, 187, 83)' | |
1074 | - // }); | |
1075 | - | |
1076 | - // clickedPin.fillStyle = radialAfterClick; | |
1077 | - | |
1078 | - // var pinID = (clickedPin.name).substring(7, (clickedPin.name).length); | |
1079 | - // // alert('pinId: ' + pinID); | |
1080 | - // //showAnnotation(); | |
1081 | - | |
1082 | - // var pinData = new jinqJs() | |
1083 | - // .from($scope.aaPinData) | |
1084 | - // .where("_PinId == " + pinID) | |
1085 | - // .select(); | |
1086 | - | |
1087 | - | |
1088 | - // var pinTermNumber = pinData[0]._TermId; | |
1089 | - | |
1090 | - // var pinWithSameTerm = new jinqJs() | |
1091 | - | |
1092 | - // .from($scope.aaPinData) | |
1093 | - // .where("_TermId == " + pinTermNumber) | |
1094 | - // .select(); | |
1095 | - | |
1096 | - | |
1097 | - // if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) { | |
1098 | - | |
1099 | - // for (var i = 0; i < pinWithSameTerm.length; i++) { | |
1100 | - | |
1101 | - // $scope.clickedPins.push({ 'id': pinWithSameTerm[i]._PinId }) | |
1102 | - // } | |
1103 | - | |
1104 | - // } | |
1105 | - | |
1106 | - // var selectedPinData = new jinqJs() | |
1107 | - // .from($scope.aaPinData) | |
1108 | - // .where("_PinId == " + pinID) | |
1109 | - // .select(); | |
1110 | - // if (clickedPin.event.ctrlKey == true) { | |
1111 | - // $scope.showAnnotation(selectedPinData, true, true, false); | |
1112 | - | |
1113 | - // } | |
1114 | - // else { | |
1115 | - // $scope.showAnnotation(selectedPinData, false, true, false); | |
1116 | - | |
1117 | - // } | |
1118 | - | |
1119 | - | |
1120 | - // } | |
1121 | - | |
1122 | - // }).drawLayers(); | |
1123 | - //} | |
1036 | + | |
1124 | 1037 | |
1125 | 1038 | } |
1126 | 1039 | ... | ... |