diff --git a/src/web/aprsc-graph.js b/src/web/aprsc-graph.js
index e128cf2..90637d7 100644
--- a/src/web/aprsc-graph.js
+++ b/src/web/aprsc-graph.js
@@ -84,12 +84,12 @@ var graph_module = angular.module('graph', [ ]).
});
};
- instance.gr_switch = function($scope, id) {
+ instance.gr_switch = function(id) {
instance.graph_selected = id;
instance.range_selected = false;
- $scope.graph_zoomed = false;
+ instance.scope.graph_zoomed = false;
$('#graph').trigger('plotunselected');
- instance.load_graph($scope);
+ instance.load_graph(instance.scope);
};
instance.graph_zoom = function(zoom_in) {
@@ -112,7 +112,7 @@ var graph_module = angular.module('graph', [ ]).
instance.graph_setup = function($scope) {
instance.scope = $scope;
- instance.gr_switch($scope, 'totals.tcp_bytes_rx');
+ instance.gr_switch('totals.tcp_bytes_rx');
$('#graph').bind('plotselected', function(event,ranges) {
var to = parseInt(ranges.xaxis.to.toFixed(0));
diff --git a/src/web/aprsc.js b/src/web/aprsc.js
index 478fb43..ccc26ea 100644
--- a/src/web/aprsc.js
+++ b/src/web/aprsc.js
@@ -1031,7 +1031,9 @@ app.controller('aprscc', [ '$scope', '$http', 'graphs', function($scope, $http,
'cols_clients': cols_clients
};
+ /* graph zooming and switching */
$scope.graphZoom = graphs.graph_zoom;
+ $scope.graphSwitch = function(tree, key) { graphs.gr_switch(tree + '.' + key); };
/* set up sorting for client and peer lists */
$scope.clients_sort = {
diff --git a/src/web/index.html b/src/web/index.html
index 58a3237..e3160e7 100644
--- a/src/web/index.html
+++ b/src/web/index.html
@@ -57,7 +57,7 @@
- | {{ setup.key_translate[k] }} |
+ {{ setup.key_translate[k] }} |
{{ status.totals[k] }} |
{{ (status.totals[k] - status_prev.totals[k]) / status.tick_dif | ratestr}}/s |
@@ -78,7 +78,7 @@
- | {{ setup.key_translate[k] }} |
+ {{ setup.key_translate[k] }} |
{{ status.dupecheck[k] }} |
{{ (status.dupecheck[k] - status_prev.dupecheck[k]) / status.tick_dif | ratestr}}/s |