From 2416139f78c6f766d56ec0859bb1e4af40b12c60 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Mon, 22 May 2017 14:52:46 +0200
Subject: [PATCH] Update colors and add combined graph

---
 client/static/scripts/realtimetraffic.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/static/scripts/realtimetraffic.js b/client/static/scripts/realtimetraffic.js
index 24ee81f..1362f78 100644
--- a/client/static/scripts/realtimetraffic.js
+++ b/client/static/scripts/realtimetraffic.js
@@ -40,9 +40,14 @@
             element: document.getElementById("chart"),
             height: 300,
             width: 690,
-            renderer: 'line',
-            interpolation: 'basis',
-            series: new Rickshaw.Series.FixedDuration([ { name: 'rx_tx_abs_diff', color: "palegreen" }, { name: 'rx_kbits', color: "mediumslateblue" }, { name: 'tx_kbits', color: "lightcoral" }], undefined, {
+            renderer: "multi",
+            interpolation: "cardinal",
+            series: new Rickshaw.Series.FixedDuration([
+                { name: 'rx_tx_abs_diff', color: "wheat", renderer: "bar" },
+                { name: 'rx_kbits', color: "mediumslateblue", renderer: "line" },
+                { name: 'tx_kbits', color: "lightcoral", renderer: "line" },
+                { name: 'rx_tx_combined', color: "mistyrose", renderer: "line" }
+            ], undefined, {
                 timeInterval: this.tv,
                 maxDataPoints: 100,
                 timeBase: new Date().getTime() / 1000
@@ -143,6 +148,7 @@
                         rx_kbits: (that.history.rx_bytes.reduce(add, 0) / that.history.rx_bytes.length) * 8 / 1024,
                         tx_kbits: (that.history.tx_bytes.reduce(add, 0) / that.history.tx_bytes.length) * 8 / 1024
                     };
+                    d.rx_tx_combined = d.rx_kbits + d.tx_kbits;
                     d.rx_tx_abs_diff = Math.abs(d.rx_kbits - d.tx_kbits);
                     if (that.history.rx_bytes.length > 1) {
                         that.history.rx_bytes.shift();
@@ -250,5 +256,3 @@ $(document).ready(function() {
 });
 
 }());
-
-