From eed0d9c8d2b9b7d70cb4ca12e4352e6af13f548a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 8 Jun 2016 07:23:44 +0200
Subject: [PATCH] feat(graph performance): graph performance tweaks,
 refactoring #5297

---
 public/app/core/profiler.ts             |  7 ++---
 public/app/plugins/panel/graph/graph.js | 36 +++++++++----------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/public/app/core/profiler.ts b/public/app/core/profiler.ts
index 0a0d611ac55..8684a5d3531 100644
--- a/public/app/core/profiler.ts
+++ b/public/app/core/profiler.ts
@@ -36,7 +36,9 @@ export class Profiler {
   }
 
   refresh() {
-    if (this.panels.length > 0) {
+    this.panels = [];
+
+    setTimeout(() => {
       var totalRender = 0;
       var totalQuery = 0;
 
@@ -49,8 +51,7 @@ export class Profiler {
       console.log('total query: ' + totalQuery);
       console.log('total render: ' + totalRender);
       console.log('avg render: ' + totalRender / this.panels.length);
-    }
-    this.$rootScope.panels = [];
+    }, 5000);
   }
 
   dashboardFetched() {
diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js
index 3097bc6eac6..3a42df657a5 100755
--- a/public/app/plugins/panel/graph/graph.js
+++ b/public/app/plugins/panel/graph/graph.js
@@ -18,6 +18,8 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
   'use strict';
 
   var module = angular.module('grafana.directives');
+  var labelWidthCache = {};
+  var panelWidthCache = {};
 
   module.directive('grafanaGraph', function($rootScope, timeSrv) {
     return {
@@ -110,20 +112,13 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
           }
         }
 
-        function getLabelWidth(type, text, elem) {
-          var labelWidth = 0;
-          if (!rootScope.labelWidthCache) {
-            rootScope.labelWidthCache = {};
-          }
-          if (!rootScope.labelWidthCache[type]) {
-            rootScope.labelWidthCache[type] = {};
-          }
-          if (rootScope.labelWidthCache[type][text]) {
-            labelWidth = rootScope.labelWidthCache[type][text];
-          } else {
-            labelWidth = elem.width();
-            rootScope.labelWidthCache[type][text] = labelWidth;
+        function getLabelWidth(text, elem) {
+          var labelWidth = labelWidthCache[text];
+
+          if (!labelWidth) {
+            labelWidth = labelWidthCache[text] = elem.width();
           }
+
           return labelWidth;
         }
 
@@ -155,7 +150,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
               .text(panel.yaxes[0].label)
               .appendTo(elem);
 
-            yaxisLabel[0].style.marginTop = (getLabelWidth('left', panel.yaxes[0].label, yaxisLabel) / 2) + 'px';
+            yaxisLabel[0].style.marginTop = (getLabelWidth(panel.yaxes[0].label, yaxisLabel) / 2) + 'px';
           }
 
           // add right axis labels
@@ -164,7 +159,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
               .text(panel.yaxes[1].label)
               .appendTo(elem);
 
-            rightLabel[0].style.marginTop = (getLabelWidth('right', panel.yaxes[1].label, rightLabel) / 2) + 'px';
+            rightLabel[0].style.marginTop = (getLabelWidth(panel.yaxes[1].label, rightLabel) / 2) + 'px';
           }
         }
 
@@ -177,14 +172,9 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
 
         // Function for rendering panel
         function render_panel() {
-          if (!rootScope.panelWidthCache) {
-            rootScope.panelWidthCache = {};
-          }
-          if (rootScope.panelWidthCache[panel.span]) {
-            panelWidth = rootScope.panelWidthCache[panel.span];
-          } else {
-            panelWidth = elem.width();
-            rootScope.panelWidthCache[panel.span] = panelWidth;
+          panelWidth = panelWidthCache[panel.span];
+          if (!panelWidth) {
+            panelWidth = panelWidthCache[panel.span] = elem.width();
           }
 
           if (shouldAbortRender()) {