Skip to content

Commit 20efd21

Browse files
committed
general tidy ups
1 parent b669063 commit 20efd21

File tree

2 files changed

+17
-23
lines changed

2 files changed

+17
-23
lines changed

generate.py

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
from svg_wheel import generate_svg_wheel
2-
from utils import (
3-
annotate_wheels,
4-
get_top_packages,
5-
remove_irrelevant_packages,
6-
save_to_file,
7-
)
8-
2+
from utils import (annotate_wheels, get_top_packages,
3+
remove_irrelevant_packages, save_to_file)
94

105
TO_CHART = 360
116

svg_wheel.py

+15-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import os
33
import xml.etree.ElementTree as et
44

5-
65
HEADERS = '''<?xml version=\"1.0\" standalone=\"no\"?>
76
<?xml-stylesheet href="wheel.css" type="text/css"?>
87
<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"
@@ -22,11 +21,11 @@
2221
PADDING = 10
2322
RADIUS = 180
2423
CENTER = PADDING + RADIUS
25-
TAU = 2*math.pi
24+
TAU = 2 * math.pi
2625

2726

2827
def annular_sector_path(start, stop):
29-
inner_radius = RADIUS//2
28+
inner_radius = RADIUS // 2
3029
outer_radius = RADIUS
3130
cos_stop = math.cos(stop)
3231
cos_start = math.cos(start)
@@ -36,14 +35,14 @@ def annular_sector_path(start, stop):
3635
points = {
3736
'inner_radius': inner_radius,
3837
'outer_radius': outer_radius,
39-
'start_outer_x': CENTER + outer_radius*cos_start,
40-
'start_outer_y': CENTER + outer_radius*sin_start,
41-
'end_outer_x': CENTER + outer_radius*cos_stop,
42-
'end_outer_y': CENTER + outer_radius*sin_stop,
43-
'start_inner_x': CENTER + inner_radius*cos_stop,
44-
'start_inner_y': CENTER + inner_radius*sin_stop,
45-
'end_inner_x': CENTER + inner_radius*cos_start,
46-
'end_inner_y': CENTER + inner_radius*sin_start,
38+
'start_outer_x': CENTER + outer_radius * cos_start,
39+
'start_outer_y': CENTER + outer_radius * sin_start,
40+
'end_outer_x': CENTER + outer_radius * cos_stop,
41+
'end_outer_y': CENTER + outer_radius * sin_stop,
42+
'start_inner_x': CENTER + inner_radius * cos_stop,
43+
'start_inner_y': CENTER + inner_radius * sin_stop,
44+
'end_inner_x': CENTER + inner_radius * cos_start,
45+
'end_inner_y': CENTER + inner_radius * sin_start,
4746
}
4847
return PATH_TEMPLATE.format(**points)
4948

@@ -60,14 +59,14 @@ def angles(index, total):
6059
start = index * TAU / total
6160
stop = (index + 1) * TAU / total
6261

63-
return (start - TAU/4, stop - TAU/4)
62+
return (start - TAU / 4, stop - TAU / 4)
6463

6564

6665
def add_fraction(wheel, packages, total):
6766
text_attributes = {
6867
'text-anchor': 'middle',
6968
'dominant-baseline': 'central',
70-
'font-size': str(2*OFFSET),
69+
'font-size': str(2 * OFFSET),
7170
'font-family': '"Helvetica Neue",Helvetica,Arial,sans-serif',
7271
'fill': '#333333',
7372
}
@@ -85,8 +84,8 @@ def add_fraction(wheel, packages, total):
8584
# Dividing line
8685
et.SubElement(
8786
wheel, 'line',
88-
x1=str(CENTER - FRACTION_LINE//2), y1=str(CENTER),
89-
x2=str(CENTER + FRACTION_LINE//2), y2=str(CENTER),
87+
x1=str(CENTER - FRACTION_LINE // 2), y1=str(CENTER),
88+
x2=str(CENTER + FRACTION_LINE // 2), y2=str(CENTER),
9089
attrib={'stroke': '#333333', 'stroke-width': '2'},
9190
)
9291

@@ -102,7 +101,7 @@ def add_fraction(wheel, packages, total):
102101
def generate_svg_wheel(packages, total):
103102
wheel = et.Element(
104103
'svg',
105-
viewBox='0 0 {0} {0}'.format(2*CENTER),
104+
viewBox='0 0 {0} {0}'.format(2 * CENTER),
106105
version='1.1',
107106
xmlns='http://www.w3.org/2000/svg',
108107
)

0 commit comments

Comments
 (0)