[ARVADOS] updated: b210f531c6db76f5f9bc5dac948a32eb52ad7e03
Git user
git at public.curoverse.com
Wed Jul 19 09:48:35 EDT 2017
Summary of changes:
.../crunchstat_summary/chartjs.js | 31 -------------
.../crunchstat_summary/chartjs.py | 53 ----------------------
2 files changed, 84 deletions(-)
delete mode 100644 tools/crunchstat-summary/crunchstat_summary/chartjs.js
delete mode 100644 tools/crunchstat-summary/crunchstat_summary/chartjs.py
via b210f531c6db76f5f9bc5dac948a32eb52ad7e03 (commit)
from a143375dc725aa517c091c6826bf37b4caa69161 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b210f531c6db76f5f9bc5dac948a32eb52ad7e03
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jul 19 09:43:39 2017 -0400
11842: Remove chartjs.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/tools/crunchstat-summary/crunchstat_summary/chartjs.js b/tools/crunchstat-summary/crunchstat_summary/chartjs.js
deleted file mode 100644
index a369f26..0000000
--- a/tools/crunchstat-summary/crunchstat_summary/chartjs.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-window.onload = function() {
- var charts = {};
- chartdata.forEach(function(section, section_idx) {
- var h1 = document.createElement('h1');
- h1.appendChild(document.createTextNode(section.label));
- document.body.appendChild(h1);
- section.charts.forEach(function(data, chart_idx) {
- // Skip chart if every series has zero data points
- if (0 == data.data.reduce(function(len, series) {
- return len + series.dataPoints.length;
- }, 0)) {
- return;
- }
- var id = 'chart-'+section_idx+'-'+chart_idx;
- var div = document.createElement('div');
- div.setAttribute('id', id);
- div.setAttribute('style', 'width: 100%; height: 150px');
- document.body.appendChild(div);
- charts[id] = new CanvasJS.Chart(id, data);
- charts[id].render();
- });
- });
-
- if (typeof window.debug === 'undefined')
- window.debug = {};
- window.debug.charts = charts;
-};
diff --git a/tools/crunchstat-summary/crunchstat_summary/chartjs.py b/tools/crunchstat-summary/crunchstat_summary/chartjs.py
deleted file mode 100644
index d047144..0000000
--- a/tools/crunchstat-summary/crunchstat_summary/chartjs.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-import math
-import crunchstat_summary.webchart
-
-
-class ChartJS(crunchstat_summary.webchart.WebChart):
- JSLIB = 'https://cdnjs.cloudflare.com/ajax/libs/canvasjs/1.7.0/canvasjs.min.js'
- JSASSET = 'chartjs.js'
-
- def chartdata(self, label, tasks, stat):
- return {
- 'axisY': self._axisY(tasks=tasks, stat=stat),
- 'data': [
- {
- 'type': 'line',
- 'markerType': 'none',
- 'dataPoints': self._datapoints(
- label=uuid, task=task, series=task.series[stat]),
- }
- for uuid, task in tasks.iteritems()
- ],
- 'title': {
- 'text': '{}: {} {}'.format(label, stat[0], stat[1]),
- },
- 'zoomEnabled': True,
- }
-
- def _axisY(self, tasks, stat):
- ymax = 1
- for task in tasks.itervalues():
- for pt in task.series[stat]:
- ymax = max(ymax, pt[1])
- ytick = math.exp((1+math.floor(math.log(ymax, 2)))*math.log(2))/4
- return {
- 'gridColor': '#cccccc',
- 'gridThickness': 1,
- 'interval': ytick,
- 'minimum': 0,
- 'maximum': ymax,
- 'valueFormatString': "''",
- }
-
- def _datapoints(self, label, task, series):
- points = [
- {'x': pt[0].total_seconds(), 'y': pt[1]}
- for pt in series]
- if len(points) > 0:
- points[-1]['markerType'] = 'cross'
- points[-1]['markerSize'] = 12
- return points
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list