diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user index ad2d216..7b4788a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user @@ -1,7 +1,7 @@ - + - ShowAllFiles + ProjectFiles diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index a7ff48f..340b7e0 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -185,60 +185,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo function (result) { $scope.aaPinData = result.data.Root.Item; angular.forEach($scope.aaPinData, function (value, key) { - //CREATING PIN WITHOUT CANAVS - //var ax = value._PinX; - //var ay = value._PinY; - //var bx = value._HeadX; - //var by = value._HeadY; - - //if (ax > bx) { - // bx = ax + bx; - // ax = bx - ax; - // bx = bx - ax; - // by = ay + by; - // ay = by - ay; - // by = by - ay; - //} - - - //console.log('ax: ' + ax); - //console.log('ay: ' + ay); - //console.log('bx: ' + bx); - //console.log('by: ' + by); - - //var angle = Math.atan((ay - by) / (bx - ax)); - //console.log('angle: ' + angle); - - //angle = (angle * 180 / Math.PI); - //console.log('angle: ' + angle); - //angle = -angle; - //console.log('angle: ' + angle); - - //var length = Math.sqrt((ax - bx) * (ax - bx) + (ay - by) * (ay - by)); - //console.log('length: ' + length); - - //var style = "" - //style += "left:" + (ax) + "px;" - //style += "top:" + (ay) + "px;" - //style += "width:" + length + "px;" - //style += "height:1px;" - //style += "background-color:black;" - //style += "position:absolute;" - //style += "transform:rotate(" + angle + "deg);" - //style += "-ms-transform:rotate(" + angle + "deg);" - //style += "transform-origin:0% 0%;" - //style += "-moz-transform:rotate(" + angle + "deg);" - //style += "-moz-transform-origin:0% 0%;" - //style += "-webkit-transform:rotate(" + angle + "deg);" - //style += "-webkit-transform-origin:0% 0%;" - //style += "-o-transform:rotate(" + angle + "deg);" - //style += "-o-transform-origin:0% 0%;" - //style += "-webkit-box-shadow: 0px 0px 2px 2px rgba(0, 0, 0, .1);" - //style += "box-shadow: 0px 0px 2px 2px rgba(0, 0, 0, .1);" - //style += "z-index:99;" - //$("
").appendTo('#imageDiv'); - //END - + $scope.context.beginPath(); $scope.context.moveTo(value._PinX, value._PinY); $scope.context.lineTo(value._HeadX, value._HeadY); @@ -469,6 +416,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //1.Remove all the pins first $scope.ClearAllPins(); + //clear speech bubble + var speechBubbles = $("div[id*='sppeachBubble']"); + if (speechBubbles != null || speechBubbles != undefined && speechBubbles.length > 0) { + for (var j = 0; j < speechBubbles.length; j++) { + + speechBubbles[j].parentNode.removeChild(speechBubbles[j]); + } + } + var speechBubbleLines = $("div[id*='sppeachBubbleLine']"); + if (speechBubbleLines != null || speechBubbleLines != undefined && speechBubbleLines.length > 0) { + for (var j = 0; j < speechBubbleLines.length; j++) { + + speechBubbleLines[j].parentNode.removeChild(speechBubbleLines[j]); + } + } + + var selectedSystemName = event.currentTarget.title; //2. get pinData var promise = ModuleService.getPinDataForImage($rootScope.imageName) @@ -569,72 +533,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.longestAnnotation = $scope.MultiLanguageAnnationArray.reduce(function (firstAnnotation, seconAnnotation) { return firstAnnotation.length > seconAnnotation.length ? firstAnnotation : seconAnnotation; }); $scope.createSpeechBubbleBasedOnAnnotationLengthwithoutCtrl(x, y,PinId); - //2. - //if (event.ctrlKey) { - // console.log('ctrl pressed'); - // $scope.multiAnnotationIsON = true; - // //2.1 create unique speech bubbles - // $scope.speechBubbleCounter = $scope.speechBubbleCounter + 1; - // var id = "speechBubble" + $scope.speechBubbleCounter; - // //2.2 Get clicked locationa and find if it is already clicked earlier too on same location - // var pointClicked = parseInt(x) + parseInt(y); - // var isClickedOnSamePoint = $("#canvasDiv").find("div[id=" + pointClicked + "]").length; - // console.log('isClickedOnSamePoint: ' + isClickedOnSamePoint); - // // if user has not clciked on smae point then create speech bubble otherwise not - // if (isClickedOnSamePoint == 0) { - // console.log('not clicked on same point') - // $scope.createSpeechBubbleBasedOnAnnotationLength(pointClicked, x, y, id); - // $scope.speechbubbleList.push({ xaxis: x, yaxis: y, ids: id }); - // } - // $('.appendDragg').draggable({ - // drag: function (evt) { - // $(this).prev('div').css("display", "none"); - // var bor_id = $(this).next('div').attr('id'); - // var sub_id1 = $(this).attr('id'); - // var verticalScrollPosition = canvasDiv.scrollTop; - // var horizontlScrollPosition = canvasDiv.scrollLeft; - // if ($scope.speechbubbleList != null || $scope.speechbubbleList != undefined) { - // for (var m = 0; m <= $scope.speechbubbleList.length - 1; m++) { - // if ($scope.speechbubbleList[m].ids == sub_id1) { - // $scope.angle1($scope.speechbubbleList[m].xaxis, $scope.speechbubbleList[m].yaxis, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, bor_id); - // break; - // } - // } - // } - // }, - // }); - // $('.dynCross').on('click', function (evt) { - // //$(this).parent().parent().parent().css('display', 'none'); - // $(this).parent().parent().parent().remove(); - // }); - //} - // else { - // $scope.multiAnnotationIsON = false; - //history maintained issue - //if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { - // $("#sppeachBubble").remove(); - // $("#dot").remove(); - //} - // $(".com").remove(); - // $("#bord").remove(); - - //history maintained issue - //if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "60000"; } - //$('#sppeachBubble').draggable( - //{ - // drag: function (evt) { - // $("#dot").css("visibility", "hidden"); - // var verticalScrollPosition = canvasDiv.scrollTop; - // var horizontlScrollPosition = canvasDiv.scrollLeft; - // $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#imageDiv').offset().left, evt.pageY + verticalScrollPosition - $('#imageDiv').offset().top, true); - // }, - //}); - //$('.crossDiv_temp').on('click', function (evt) { - // $('#sppeachBubble').remove(); - // $("#bord").remove(); - // $("#dot").remove(); - //}); - //} + } $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo, language) { @@ -844,7 +743,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } var Globe = []; - debugger; + $rootScope.Globe1.push({ "currentX": x, "currentY": y, "id": PinId }); Globe.push({ currentX: x, currentY: y}); document.getElementById('speechBubbleLine' + PinId + '').style.display = 'block';