ua1zbe
/
aprsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graph: Fix zooming

This commit is contained in:
Heikki Hannikainen 2016-08-01 08:49:23 +03:00
parent 4fd02f393e
commit 7a20382382
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/web/aprsc.js
View File

@ -867,34 +867,24 @@ function graph_fill(cdata, opts)
}
var zoomed_in = false;
function graphZoom(zoom_in)
function graph_zoom($scope, zoom_in)
{
if (range_selected && zoom_in) {
zoomed_in = true;
$scope.graph_zoomed = zoomed_in = true;
graph_opt.xaxis.min = range_selected.from;
graph_opt.xaxis.max = range_selected.to;
} else {
zoomed_in = false;
$scope.graph_zoomed = zoomed_in = false;
graph_opt.xaxis.min = null;
graph_opt.xaxis.max = null;
}
update_buttons();
var p = $.plot($('#graph'), graph_data, graph_opt);
if (range_selected)
p.setSelection({ xaxis: { from: range_selected.from, to: range_selected.to }});
}
function update_buttons()
{
if (zoomed_in)
$('#g_zoom_out').show();
else
$('#g_zoom_out').hide();
}
var graphs = {
'totals.clients': { 'label': 'Clients allocated' },
'totals.connects': { 'label': 'Incoming connections/min' },
@ -931,8 +921,7 @@ function load_graph_success(data)
graph_fill(data, d);
schedule_graph(60000);
$('#graph').trigger('plotunselected');
zoomed_in = false;
update_buttons();
this.scope.graph_zoomed = zoomed_in = false;
}
function load_graph_error(jqXHR, stat, errorThrown)
@ -947,7 +936,7 @@ function load_graph_error(jqXHR, stat, errorThrown)
schedule_graph(60000);
}
function load_graph()
function load_graph($scope)
{
var k = graph_selected;
@ -963,20 +952,19 @@ function load_graph()
url: '/counterdata?' + k,
dataType: 'json',
timeout: 5000,
context: { 'k': k },
context: { 'k': k, 'scope': $scope },
success: load_graph_success,
error: load_graph_error
});
}
function gr_switch(id)
function gr_switch($scope, id)
{
graph_selected = id;
range_selected = false;
zoomed_in = false;
$scope.graph_zoomed = zoomed_in = false;
$('#graph').trigger('plotunselected');
update_buttons();
load_graph();
load_graph($scope);
}
var motd_last;
@ -1052,9 +1040,9 @@ function init()
/* ******** NEW angular.js ********* */
function graph_setup()
function graph_setup($scope)
{
gr_switch('totals.tcp_bytes_rx');
gr_switch($scope, 'totals.tcp_bytes_rx');
$('#graph').bind('plotselected', function(event,ranges) {
var to = parseInt(ranges.xaxis.to.toFixed(0));
@ -1204,6 +1192,10 @@ app.controller('aprscc', [ '$scope', '$http', function($scope, $http) {
'cols_clients': cols_clients
};
$scope.graphZoom = function(zoom_in) {
graph_zoom($scope, zoom_in);
};
/* Ajax updates */
var full_load = function($scope, $http) {
@ -1232,7 +1224,7 @@ app.controller('aprscc', [ '$scope', '$http', function($scope, $http) {
full_load($scope, $http);
graph_setup();
graph_setup($scope);
}]);

4
src/web/index.html
View File

@ -45,8 +45,8 @@
<div class='col-md-8 col-sm-12'>
<div style='height: 230px;' id='graph'></div>
<div style='padding: 5px 0 0 0;'>
<button onclick='graphZoom(1)' disabled='1' id='g_zoom_in'>Zoom</button>
<button onclick='graphZoom(0)' class='hide' id='g_zoom_out'>Zoom out</button>
<button ng-click='graphZoom(1)' ng-hide='graph_zoomed'>Zoom</button>
<button ng-click='graphZoom(0)' ng-hide='!graph_zoomed'>Zoom out</button>
</div>
</div>
</div>