diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index a876757..6fb8118 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -951,7 +951,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo click: function (clickedPin) { // alert('pin clciked = ' + clickedPin.name) - + if (clickedPin.event.ctrlKey == false) { + $scope.clickedPins = []; + } var pinID = (clickedPin.name).substring(7, (clickedPin.name).length); // alert('pinId: ' + pinID); @@ -1031,96 +1033,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } }).drawLayers(); - //} - // else - // { - // var radial = $('#' + canvasId).createGradient({ - // x1: 50, y1: 50, - // x2: 50, y2: 50, - // r1: 10, r2: 30, - // c1: 'rgba(100, 50, 0,0)', - // c2: 'rgb(216, 216, 216)' - // }); - // $('#' + canvasId).drawLine({ - - // layer: true, - // name: "Pin_" + PinId, - // groups: ["Pin_" + PinId], - // strokeStyle: 'black', - // strokeWidth: 2, - // visible: true, - // x1: offsetX1, y1: offsetY1, - // x2: x, y2: y, - - // }).drawArc({ - // name: "PinArc_" + PinId, - // layer: true, - // groups: ["Pin_" + PinId], - // strokeStyle: 'grey', - // strokeWidth: 2, - // visible: true, - // fillStyle: radial, - // x: x, y: y, - // radius: 5, - - // click: function (clickedPin) { - // alert('pin clciked = ' + clickedPin.name) //change the head color to green - // var radialAfterClick = $('#aaDetailViewCanvas').createGradient({ - // x1: 50, y1: 50, - // x2: 50, y2: 50, - // r1: 10, r2: 30, - // c1: 'rgba(100, 50, 0,0)', - // c2: 'rgb(126, 187, 83)' - // }); - - // clickedPin.fillStyle = radialAfterClick; - - // var pinID = (clickedPin.name).substring(7, (clickedPin.name).length); - // // alert('pinId: ' + pinID); - // //showAnnotation(); - - // var pinData = new jinqJs() - // .from($scope.aaPinData) - // .where("_PinId == " + pinID) - // .select(); - - - // var pinTermNumber = pinData[0]._TermId; - - // var pinWithSameTerm = new jinqJs() - - // .from($scope.aaPinData) - // .where("_TermId == " + pinTermNumber) - // .select(); - - - // if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) { - - // for (var i = 0; i < pinWithSameTerm.length; i++) { - - // $scope.clickedPins.push({ 'id': pinWithSameTerm[i]._PinId }) - // } - - // } - - // var selectedPinData = new jinqJs() - // .from($scope.aaPinData) - // .where("_PinId == " + pinID) - // .select(); - // if (clickedPin.event.ctrlKey == true) { - // $scope.showAnnotation(selectedPinData, true, true, false); - - // } - // else { - // $scope.showAnnotation(selectedPinData, false, true, false); - - // } - - - // } - - // }).drawLayers(); - //} + } @@ -1626,7 +1539,6 @@ $(document).ready(function () { } } - console.log('ui.value= '+ui.value+' ,relativeWidth= ' + relativeWidth + ',relativeHeight= ' + relativeHeight) if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) { $("#modItemImage").css("width", relativeWidth + "px"); $("#modItemImage").css("height", relativeHeight + "px");