diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index cd53640..f4ed9fd 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -169,11 +169,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
canvas.style.left = '0px';
canvas.style.top = '0px';
canvas.style.position = "absolute";
- canvas.addEventListener('click', function () {
- alert('canvas clicked');
- var clickedPint = $scope.getMousePos(event);
- alert('x: ' + clickedPint.x + ', y:' + clickedPint.y);
- })
+ //canvas.addEventListener('click', function () {
+ // alert('canvas clicked');
+ // var clickedPint = $scope.getMousePos(event);
+ // alert('x: ' + clickedPint.x + ', y:' + clickedPint.y);
+ //})
$("#canvasDiv").append(canvas);
$scope.context = canvas.getContext("2d")
@@ -903,7 +903,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.drawStaticPinsOnImage = function (canvasId, PinId, offsetX1, offsetY1, x, y) {
console.log('drawStaticPinsOnImage')
- if ($scope.isSliderChange == true) {
+ // if ($scope.isSliderChange == true) {
console.log('isSliderrChange')
var radial = $('#' + canvasId).createGradient({
x1: 50, y1: 50,
@@ -992,96 +992,96 @@ 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)'
- });
+ //}
+ // 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({
- clickedPin.fillStyle = radialAfterClick;
+ // layer: true,
+ // name: "Pin_" + PinId,
+ // groups: ["Pin_" + PinId],
+ // strokeStyle: 'black',
+ // strokeWidth: 2,
+ // visible: true,
+ // x1: offsetX1, y1: offsetY1,
+ // x2: x, y2: y,
- var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
- // alert('pinId: ' + pinID);
- //showAnnotation();
+ // }).drawArc({
+ // name: "PinArc_" + PinId,
+ // layer: true,
+ // groups: ["Pin_" + PinId],
+ // strokeStyle: 'grey',
+ // strokeWidth: 2,
+ // visible: true,
+ // fillStyle: radial,
+ // x: x, y: y,
+ // radius: 5,
- var pinData = new jinqJs()
- .from($scope.aaPinData)
- .where("_PinId == " + pinID)
- .select();
+ // 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 pinTermNumber = pinData[0]._TermId;
+ // var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
+ // // alert('pinId: ' + pinID);
+ // //showAnnotation();
- var pinWithSameTerm = new jinqJs()
+ // var pinData = new jinqJs()
+ // .from($scope.aaPinData)
+ // .where("_PinId == " + pinID)
+ // .select();
- .from($scope.aaPinData)
- .where("_TermId == " + pinTermNumber)
- .select();
+ // var pinTermNumber = pinData[0]._TermId;
- if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
+ // var pinWithSameTerm = new jinqJs()
- for (var i = 0; i < pinWithSameTerm.length; i++) {
+ // .from($scope.aaPinData)
+ // .where("_TermId == " + pinTermNumber)
+ // .select();
- $scope.clickedPins.push({ 'id': pinWithSameTerm[i]._PinId })
- }
- }
+ // if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
- var selectedPinData = new jinqJs()
- .from($scope.aaPinData)
- .where("_PinId == " + pinID)
- .select();
- if (clickedPin.event.ctrlKey == true) {
- $scope.showAnnotation(selectedPinData, true, true, false);
+ // for (var i = 0; i < pinWithSameTerm.length; i++) {
- }
- else {
- $scope.showAnnotation(selectedPinData, false, true, false);
+ // $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();
- }
+ // }
+
+
+ // }
+
+ // }).drawLayers();
+ //}
}
@@ -1529,11 +1529,10 @@ $(document).ready(function () {
var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
scope.$apply(function () {
- // scope.showSelectedSystemPins(event);
var relativeWidth = 0;
var relativeHeight = 0;
- //scope.sliderPercentValue = 0;
- if (ui.value == 100) {
+
+ if (ui.value == 100) {
relativeWidth = scope.ViewImageWidth;
relativeHeight = scope.ViewImageHeight
scope.sliderPercentValue = 1.0;
@@ -1587,11 +1586,7 @@ $(document).ready(function () {
canvas.style.left = '0px';
canvas.style.top = '0px';
canvas.style.position = "absolute";
- //canvas.addEventListener('click', function () {
- // alert('canvas clicked');
- // var clickedPint = scope.getMousePos(event);
- // alert('x: ' + clickedPint.x + ', y:' + clickedPint.y);
- //})
+
$("#canvasDiv").append(canvas);
scope.context = canvas.getContext("2d")
$("#modItemImage").attr('src', scope.OpenItemImagePath);