From c0bb0693469558c712b296058ba18523e323c254 Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Wed, 1 Feb 2012 18:50:37 +0100 Subject: [PATCH] Fixet --- pygal/css/graph.css | 4 +- pygal/graph.py | 5 +- pygal/line.py | 62 ++++++++++++------------- test/moulinrouge/__init__.py | 22 +++++++++ test/moulinrouge/templates/index.jinja2 | 1 + 5 files changed, 57 insertions(+), 37 deletions(-) diff --git a/pygal/css/graph.css b/pygal/css/graph.css index 47f87fe..7082107 100644 --- a/pygal/css/graph.css +++ b/pygal/css/graph.css @@ -86,12 +86,12 @@ } -.bar .dataPointLabel, .lines .dataPointLabel { +.bar .dataPointLabel, .dot .dataPointLabel { fill-opacity: 0; -webkit-transition: 250ms; } -.bar:hover .dataPointLabel, .lines:hover .dataPointLabel { +.bar:hover .dataPointLabel, .dot:hover .dataPointLabel { fill-opacity: 0.9; fill: #000000; } diff --git a/pygal/graph.py b/pygal/graph.py index bdcfea3..d54fa64 100644 --- a/pygal/graph.py +++ b/pygal/graph.py @@ -202,6 +202,7 @@ class Graph(object): transform = 'translate (%s %s)' % (self.border_left, self.border_top) self.graph = node(self.root, 'g', transform=transform) self.back = node(self.graph, 'g', {'class': 'back'}) + axis = node(self.foreground, 'g', {'class': 'axis'}) node(self.back, 'rect', { 'x': 0, 'y': 0, @@ -211,12 +212,12 @@ class Graph(object): }) #Axis - node(self.foreground, 'path', { + node(axis, 'path', { 'd': 'M 0 0 v%s' % self.graph_height, 'class': 'axis', 'id': 'xAxis' }) - node(self.foreground, 'path', { + node(axis, 'path', { 'd': 'M 0 %s h%s' % (self.graph_height, self.graph_width), 'class': 'axis', 'id': 'yAxis' diff --git a/pygal/line.py b/pygal/line.py index 0f79c0b..504850a 100644 --- a/pygal/line.py +++ b/pygal/line.py @@ -60,16 +60,18 @@ class Line(Graph): label_left = len(self.fields[0]) / 2 * self.font_size * 0.6 self.border_left = max(label_left, self.border_left) + # TODO: cache this def get_y_label_values(self): max_value = self.max_value() min_value = self.min_value() range = max_value - min_value - top_pad = (range / 20.0) or 10 - scale_range = (max_value + top_pad) - min_value - scale_division = self.scale_divisions or (scale_range / 10.0) + + scale_division = self.scale_divisions or (.105 * range) if self.scale_integers: - scale_division = round(scale_division) or 1 + scale_division = round(scale_division) + + scale_division = scale_division or 1 # prevent / 0 if max_value % scale_division == 0: max_value += scale_division @@ -93,23 +95,24 @@ class Line(Graph): return coords def draw_data(self): + if len(self.data) == 0: + return + min_value = self.min_value() - field_height = self.graph_height - self.font_size * 2 * self.top_font + field_height = self.graph_height - self.font_size * 2 * self.top_font y_label_values = self.get_y_label_values() y_label_span = max(y_label_values) - min(y_label_values) - if y_label_span != 0: - field_height /= float(y_label_span) + field_height /= float(y_label_span) or 1 field_width = self.field_width() - #line = len(self.data) prev_sum = [0] * len(self.fields) cum_sum = [-min_value] * len(self.fields) coord_format = lambda c: '%(x)s %(y)s' % c - - for line_n, data in reversed(list(enumerate(self.data, 1))): + lines = node(self.graph, "g", {'class': 'lines'}) + for line_n, data in reversed(list(enumerate(self.data))): if not self.stacked: cum_sum = [-min_value] * len(self.fields) @@ -119,6 +122,7 @@ class Line(Graph): coords = map(get_coords, enumerate(cum_sum)) paths = map(coord_format, coords) line_path = ' '.join(paths) + linegroup = node(lines, "g", {'class': 'linegroup%d' % line_n}) if self.area_fill: # to draw the area, we'll use the line above, followed by @@ -133,42 +137,34 @@ class Line(Graph): area_path = "V%s" % self.graph_height origin = coord_format(get_coords((0, 0))) - d = ' '.join(( - 'M', - origin, - 'L', - line_path, - area_path, - 'Z' - )) - node(self.graph, 'path', { - 'class': 'fill fill%s' % (line_n - 1), - 'd': d, + node(linegroup, 'path', { + 'class': 'fill fill%s' % line_n, + 'd': ' '.join( + ('M', origin, 'L', line_path, area_path, 'Z')), }) # now draw the line itself - node(self.graph, 'path', { - 'd': 'M0 %s L%s' % (self.graph_height, line_path), - 'class': 'line line%s' % (line_n - 1), + node(linegroup, 'path', { + 'd': 'M%s L%s' % (paths[0], line_path), + 'class': 'line line%s' % line_n, }) - + dots = node(linegroup, "g", + {'class': 'dots'}) if self.show_data_points or self.show_data_values: - holder = node(self.graph, "g", - {'class': 'lines-holder'}) for i, value in enumerate(cum_sum): - group = node(holder, "g", - {'class': 'lines'}) + dot = node(dots, "g", + {'class': 'dot'}) if self.show_data_points: node( - group, + dot, 'circle', - {'class': 'dot dot%s' % (line_n - 1)}, + {'class': 'dot%s' % line_n}, cx=str(field_width * i), cy=str(self.graph_height - value * field_height), - r='2.5', + r='5', ) self.make_datapoint_text( - group, + dot, field_width * i, self.graph_height - value * field_height - 6, value + min_value diff --git a/test/moulinrouge/__init__.py b/test/moulinrouge/__init__.py index 72fdb37..a971d02 100644 --- a/test/moulinrouge/__init__.py +++ b/test/moulinrouge/__init__.py @@ -94,4 +94,26 @@ def create_app(): width=width, height=height) + @app.route("/bigline.svg") + def big_line_svg(): + g = Line({'fields': ['a', 'b', 'c', 'd']}) + g.width = 1500 + g.area_fill = True + g.scale_divisions = 50 + # values = [120, 50, 42, 100] + # g.add_data({'data': values, 'title': '1'}) + values = [11, 50, 133, 2] + g.add_data({'data': values, 'title': '2'}) + + return Response(g.burn(), mimetype='image/svg+xml') + + @app.route("/bigline") + def big_line(): + width, height = 900, 800 + svgs = [url_for('big_line_svg')] + return render_template('svgs.jinja2', + svgs=svgs, + width=width, + height=height) + return app diff --git a/test/moulinrouge/templates/index.jinja2 b/test/moulinrouge/templates/index.jinja2 index b9a941a..7299b06 100644 --- a/test/moulinrouge/templates/index.jinja2 +++ b/test/moulinrouge/templates/index.jinja2 @@ -3,4 +3,5 @@ {% block section %} All types Rotations test + Big line {% endblock section %}