From decd232d0fffe2ac6c8a751729262a7786f0caab Mon Sep 17 00:00:00 2001 From: Denny Lim Date: Wed, 6 Nov 2013 02:29:26 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9E=84=EB=8C=80=ED=98=84]=20[NOBTS]=20serve?= =?UTF-8?q?rmap=20mergeUnknown=EC=8B=9C=20data=20=EC=9E=AC=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@2796 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../scripts/directives/linkInfoDetails.js | 4 +++- .../scripts/directives/nodeInfoDetails.js | 12 +++++++++--- src/main/webapp/scripts/directives/serverMap.js | 17 +++++++++++++---- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/scripts/directives/linkInfoDetails.js b/src/main/webapp/scripts/directives/linkInfoDetails.js index d5cfb6228..ef30e6cd6 100644 --- a/src/main/webapp/scripts/directives/linkInfoDetails.js +++ b/src/main/webapp/scripts/directives/linkInfoDetails.js @@ -31,7 +31,9 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', function (co scope.sourceinfo = null; scope.showLinkInfoChart = false; scope.showLinkInfoBarChart = false; - scope.$digest(); + if (!scope.$$phase) { + scope.$digest(); + } }; /** diff --git a/src/main/webapp/scripts/directives/nodeInfoDetails.js b/src/main/webapp/scripts/directives/nodeInfoDetails.js index 389d97ed9..45d358bea 100644 --- a/src/main/webapp/scripts/directives/nodeInfoDetails.js +++ b/src/main/webapp/scripts/directives/nodeInfoDetails.js @@ -33,7 +33,9 @@ pinpointApp scope.agents = null; scope.showAgents = false; scope.showNodeInfoBarChart = false; - scope.$digest(); + if (!scope.$$phase) { + scope.$digest(); + } }; /** @@ -54,7 +56,9 @@ pinpointApp scope.isWas = node.isWas; // scope.agents = data.agents; // scope.showAgents = (scope.agents.length > 0) ? true : false; - scope.$digest(); + if (!scope.$$phase) { + scope.$digest(); + } }; // var getApplicationStatisticsData = function (query, callback) { @@ -83,7 +87,9 @@ pinpointApp */ renderApplicationStatistics = function (data) { scope.showNodeInfoBarChart = true; - scope.$digest(); + if (!scope.$$phase) { + scope.$digest(); + } nv.addGraph(function () { var chart = nv.models.discreteBarChart().x(function (d) { return d.label; diff --git a/src/main/webapp/scripts/directives/serverMap.js b/src/main/webapp/scripts/directives/serverMap.js index 55db93c17..84d8fac10 100644 --- a/src/main/webapp/scripts/directives/serverMap.js +++ b/src/main/webapp/scripts/directives/serverMap.js @@ -118,6 +118,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window', }); } else { getServerMapData(query, function (query, result) { + htLastMapData = result; serverMapCallback(query, result, mergeUnknowns, linkRouting, linkCurve); }); } @@ -750,7 +751,15 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window', */ scope.toggleMergeUnknowns = function () { scope.mergeUnknowns = (scope.mergeUnknowns) ? false : true; - showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.filter, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + var query = { + applicationName: scope.oNavbarDao.getApplicationName(), + serviceType: scope.oNavbarDao.getServiceType(), + from: scope.oNavbarDao.getQueryStartTime(), + to: scope.oNavbarDao.getQueryEndTime(), + period: scope.oNavbarDao.getQueryPeriod(), + filter: scope.oNavbarDao.getFilter() + }; + serverMapCallback(query, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); reset(); }; @@ -761,7 +770,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window', scope.toggleLinkLableTextType = function (type) { scope.totalRequestCount = (type !== 'tps') ? true : false; scope.tps = (type === 'tps') ? true : false; - showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.filter, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.oNavbarDao.getFilter(), scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); reset(); }; @@ -771,7 +780,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window', */ scope.toggleLinkRouting = function (type) { scope.linkRouting = cfg.options.htLinkType.sRouting = type; - showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.filter, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.oNavbarDao.getFilter(), scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); reset(); }; @@ -781,7 +790,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', '$rootScope', '$window', */ scope.toggleLinkCurve = function (type) { scope.linkCurve = cfg.options.htLinkType.sCurve = type; - showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.filter, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + showServerMap(scope.oNavbarDao.getApplicationName(), scope.oNavbarDao.getServiceType(), scope.oNavbarDao.getQueryEndTime(), scope.oNavbarDao.getQueryPeriod(), scope.oNavbarDao.getFilter(), scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); reset(); };