From 0fb9ec8e7ded480e7f97c5e4fd0174802c5f8c6e Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Fri, 30 Sep 2016 11:35:30 +0530 Subject: [PATCH] 74 merged request changes --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 19 +++++++++++++++---- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 28 +++++++++++++++++++++++++++- 400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html | 8 ++++++-- 400-SOURCECODE/AIAHTML5.Web/index.html | 36 +++++++++++++++++++++++++++++++++++- 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css | 8 ++++++-- 5 files changed, 89 insertions(+), 10 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 61ce636..a1a43d0 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2661,6 +2661,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.createDynamicSpeechBubble = function (event, x, y, isAnnotationForTBox) { + //debugger; if (isAnnotationForTBox == true) { //1. In transparency box we shows two annotation at a time, so we need to decide the max length of annotation in btween two annotation because based on that // we decide the size of speech bubble @@ -4976,6 +4977,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $("#btnNormalMode").removeClass("btn-primary"); } + //7900 + $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition); + $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition); + + } $scope.enableNormalMode = function () { @@ -5018,7 +5024,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //7. $scope.CalculateImageCordinates($rootScope.viewOrientationId); - + + $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition); $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition); @@ -6111,7 +6118,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.resetText = 0; $rootScope.resetTextSave = 0; $rootScope.ObjectIndexSave = 0; - + var arrayRect = {}; @@ -6171,7 +6178,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo rounded: true, x1: $scope.offsetX1, y1: $scope.offsetY1, x2: $scope.x, y2: $scope.y, - + click: function (layer) { $rootScope.canvasLayerNameCollection = []; $rootScope.canvasLayerNameCollection.push(layer.name); @@ -6649,7 +6656,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - //-- TextArea functionality of Annotation toolbar $rootScope.fontSizes; @@ -7892,6 +7898,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } + + + + + }] ); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 482a4fe..1c5a910 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -117,6 +117,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", //annotation tool custom events $rootScope.ShowAnnotationWindow = function () { + //7904 + $("#annotationToolBarOptions").addClass("active"); + $("#annotationButton").addClass("active"); + $rootScope.isAnnotationWindowOpen = true; $(".annotationTollbar").css("display", "block"); $rootScope.$broadcast('annotationToolEvent', true); @@ -125,7 +129,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", } $rootScope.CloseAnnotationTool = function () { - console.log('close') + console.log('close'); + //7904 + $("#annotationButton").removeClass("active"); + $("#annotationToolBarOptions").removeClass("active"); + + $(".annotationTollbar").css("display", "none"); $rootScope.isAnnotationWindowClose = true; $("#canvasPaint").css("display", "none"); @@ -349,6 +358,23 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", } + + $rootScope.enableEditShapeTooltip = function () { + + $("#edit-block").addClass("custom-tooltip-annotation"); + $(".custom-tooltip-annotation").css('display', 'block'); + + } + + $rootScope.disableEditShapeTooltip = function () { + + $(".custom-tooltip-annotation").css('display', 'none'); + $("#edit-block").removeClass("custom-tooltip-annotation"); + + + } + + $rootScope.disableAnnotationToolBar = function () { document.getElementById('modelbackground').style.display = "none"; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index 31a5072..b540b99 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -22,14 +22,18 @@
  • Print Priview
    • -
  • Annotation
    • + +
  • Annotation
    • +