From dedbe605d014fcc84b1aa9ee8bb782cf1f7f585b Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Thu, 9 Jul 2015 15:40:18 +0200 Subject: [PATCH] Tweaks --- docs/documentation/output.rst | 84 ----------------------------------- pygal/config.py | 4 +- pygal/graph/radar.py | 2 +- pygal/test/test_style.py | 1 - 4 files changed, 3 insertions(+), 88 deletions(-) diff --git a/docs/documentation/output.rst b/docs/documentation/output.rst index df8c903..bd359cc 100644 --- a/docs/documentation/output.rst +++ b/docs/documentation/output.rst @@ -111,87 +111,3 @@ Django response --------------- Same thing for django with ``render_django_response``. - - - -Table ------ - -pygal also supports a html table export of given data using the ``render_table`` option: - - -.. pygal-code:: - - line_chart = pygal.Bar() - line_chart.title = 'Browser usage evolution (in %)' - line_chart.x_labels = map(str, range(2002, 2013)) - line_chart.add('Firefox', [None, None, 0, 16.6, 25, 31, 36.4, 45.5, 46.3, 42.8, 37.1]) - line_chart.add('Chrome', [None, None, None, None, None, None, 0, 3.9, 10.8, 23.8, 35.3]) - line_chart.add('IE', [85.8, 84.6, 84.7, 74.5, 66, 58.6, 54.7, 44.8, 36.2, 26.6, 20.1]) - line_chart.add('Others', [14.2, 15.4, 15.3, 8.9, 9, 10.4, 8.9, 5.8, 6.7, 6.8, 7.5]) - line_chart.value_formatter = lambda x: '%.2f%%' % x if x is not None else '∅' - - -Default -~~~~~~~ - -.. pygal-table-code:: - - line_chart = pygal.Bar() - line_chart.title = 'Browser usage evolution (in %)' - line_chart.x_labels = map(str, range(2002, 2013)) - line_chart.add('Firefox', [None, None, 0, 16.6, 25, 31, 36.4, 45.5, 46.3, 42.8, 37.1]) - line_chart.add('Chrome', [None, None, None, None, None, None, 0, 3.9, 10.8, 23.8, 35.3]) - line_chart.add('IE', [85.8, 84.6, 84.7, 74.5, 66, 58.6, 54.7, 44.8, 36.2, 26.6, 20.1]) - line_chart.add('Others', [14.2, 15.4, 15.3, 8.9, 9, 10.4, 8.9, 5.8, 6.7, 6.8, 7.5]) - line_chart.value_formatter = lambda x: '%.2f%%' % x if x is not None else '∅' - line_chart.render_table() - - -Style -~~~~~ - -.. pygal-table-code:: - - line_chart = pygal.Bar() - line_chart.title = 'Browser usage evolution (in %)' - line_chart.x_labels = map(str, range(2002, 2013)) - line_chart.add('Firefox', [None, None, 0, 16.6, 25, 31, 36.4, 45.5, 46.3, 42.8, 37.1]) - line_chart.add('Chrome', [None, None, None, None, None, None, 0, 3.9, 10.8, 23.8, 35.3]) - line_chart.add('IE', [85.8, 84.6, 84.7, 74.5, 66, 58.6, 54.7, 44.8, 36.2, 26.6, 20.1]) - line_chart.add('Others', [14.2, 15.4, 15.3, 8.9, 9, 10.4, 8.9, 5.8, 6.7, 6.8, 7.5]) - line_chart.value_formatter = lambda x: '%.2f%%' % x if x is not None else '∅' - line_chart.render_table(style=True) - - -Total -~~~~~ - -.. pygal-table-code:: - - line_chart = pygal.Bar() - line_chart.title = 'Browser usage evolution (in %)' - line_chart.x_labels = map(str, range(2002, 2013)) - line_chart.add('Firefox', [None, None, 0, 16.6, 25, 31, 36.4, 45.5, 46.3, 42.8, 37.1]) - line_chart.add('Chrome', [None, None, None, None, None, None, 0, 3.9, 10.8, 23.8, 35.3]) - line_chart.add('IE', [85.8, 84.6, 84.7, 74.5, 66, 58.6, 54.7, 44.8, 36.2, 26.6, 20.1]) - line_chart.add('Others', [14.2, 15.4, 15.3, 8.9, 9, 10.4, 8.9, 5.8, 6.7, 6.8, 7.5]) - line_chart.value_formatter = lambda x: '%.2f%%' % x if x is not None else '∅' - line_chart.render_table(style=True, total=True) - - -Transposed -~~~~~~~~~~ - -.. pygal-table-code:: - - line_chart = pygal.Bar() - line_chart.title = 'Browser usage evolution (in %)' - line_chart.x_labels = map(str, range(2002, 2013)) - line_chart.add('Firefox', [None, None, 0, 16.6, 25, 31, 36.4, 45.5, 46.3, 42.8, 37.1]) - line_chart.add('Chrome', [None, None, None, None, None, None, 0, 3.9, 10.8, 23.8, 35.3]) - line_chart.add('IE', [85.8, 84.6, 84.7, 74.5, 66, 58.6, 54.7, 44.8, 36.2, 26.6, 20.1]) - line_chart.add('Others', [14.2, 15.4, 15.3, 8.9, 9, 10.4, 8.9, 5.8, 6.7, 6.8, 7.5]) - line_chart.value_formatter = lambda x: '%.2f%%' % x if x is not None else '∅' - line_chart.render_table(style=True, total=True, transpose=True) - diff --git a/pygal/config.py b/pygal/config.py index b071122..63f3ac2 100644 --- a/pygal/config.py +++ b/pygal/config.py @@ -357,11 +357,11 @@ class Config(CommonConfig): "Minimum order of scale, defaults to None") min_scale = Key( - 5, int, "Value", + 4, int, "Value", "Minimum number of scale graduation for auto scaling") max_scale = Key( - 20, int, "Value", + 16, int, "Value", "Maximum number of scale graduation for auto scaling") range = Key( diff --git a/pygal/graph/radar.py b/pygal/graph/radar.py index e31a208..7b5e2ed 100644 --- a/pygal/graph/radar.py +++ b/pygal/graph/radar.py @@ -181,7 +181,7 @@ class Radar(Line): y_pos = compute_scale( self._rmin, self._rmax, self.logarithmic, self.order_min, - self.min_scale, self.max_scale + self.min_scale, self.max_scale / 2 ) if not self.y_labels else list(map(int, self.y_labels)) self._x_labels = self.x_labels and list(zip(self.x_labels, x_pos)) diff --git a/pygal/test/test_style.py b/pygal/test/test_style.py index cce464b..f6fd148 100644 --- a/pygal/test/test_style.py +++ b/pygal/test/test_style.py @@ -16,7 +16,6 @@ # # You should have received a copy of the GNU Lesser General Public License # along with pygal. If not, see . -from pygal.style import Style from pygal import Line from pygal.style import ( LightStyle,