Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Revamp tls.get_subplots #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
etpinard merged 104 commits into master from revamp-get_subplots
Jan 13, 2015
Merged
Changes from 1 commit
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
9b2f4c0
add specs to revamped get_subplots()
etpinard Dec 22, 2014
637c5de
sync latest graph ref master
etpinard Dec 29, 2014
55637e0
update get_subplots() docstring
etpinard Dec 30, 2014
1b1d23a
remove old get_subplots() code
etpinard Dec 30, 2014
76c6d4e
add Exception if rows or/and columns are not integers
etpinard Dec 30, 2014
9f1c240
make h/v spacing depend on the number of rows/columns:
etpinard Dec 30, 2014
5406fb3
initialize specs list of lists:
etpinard Dec 30, 2014
26f704e
compute some common distances
etpinard Dec 30, 2014
d9341c8
loop through specs:
etpinard Dec 30, 2014
8705058
add _get_shared()
etpinard Dec 30, 2014
842ff88
add _add_domain() and _add_domain_is3D()
etpinard Dec 30, 2014
c55a92f
add _fill_grid()
etpinard Dec 30, 2014
34ee502
initialize looping variables
etpinard Dec 30, 2014
97145a5
(oops) get_shared -> _get_shared
etpinard Dec 30, 2014
5dfcfad
add print_grid
etpinard Dec 30, 2014
f72a249
modify computed domain in existing tests (because of rounding errors)
etpinard Dec 30, 2014
857a7d7
modify arguments in existing tests:
etpinard Dec 30, 2014
e64794b
test galore git diff --cached !
etpinard Dec 30, 2014
ab661f4
improve algorithm (part 1):
etpinard Dec 31, 2014
eced9a3
improve algorithm (part 2):
etpinard Dec 31, 2014
55a9b3f
improve algorithm (part 3):
etpinard Dec 31, 2014
3eba0d7
improve algorithm (part 4):
etpinard Dec 31, 2014
79c9868
improve algorthm (part 5):
etpinard Dec 31, 2014
ca08227
remove _get_shared()
etpinard Dec 31, 2014
4efbb4f
add _get_label()
etpinard Dec 31, 2014
69214c6
add _get_anchors
etpinard Dec 31, 2014
0497009
update _add_domain and _add_domain_is3D
etpinard Dec 31, 2014
a83ad48
code aesthetics
etpinard Dec 31, 2014
2d781f6
modify expected values in tests due to rounding errors
etpinard Dec 31, 2014
b8e9f53
add 2nd rowspan test (that discovered the bug)
etpinard Dec 31, 2014
46ed9d7
more test updating due to rounding errors
etpinard Dec 31, 2014
540b734
update shared axis tests
etpinard Dec 31, 2014
7b0e8fb
add 1 shared_xaxes=True, shared_yaxes=True test
etpinard Dec 31, 2014
f6a64d1
sub isEmpty -> is_empyt , is3D -> is_3d
etpinard Jan 2, 2015
bed60db
add info about 'insets' in docstring
etpinard Jan 4, 2015
50eeb8f
add try/except block for kwargs['insets']
etpinard Jan 4, 2015
1a2192e
aesthestic in SPEC_defaults
etpinard Jan 4, 2015
443217e
add functions checking and filling keys (for 'specs' & 'insets')
etpinard Jan 4, 2015
a72f043
send specs to _check_keys_and_fill()
etpinard Jan 4, 2015
8e3e83d
check and fill 'insets'
etpinard Jan 4, 2015
d30e7b9
raise Exception if non-valid kwarg is sent to get_subplots
etpinard Jan 4, 2015
f9235b3
loop through insets!
etpinard Jan 4, 2015
dfa47f7
add inset str reprensation
etpinard Jan 4, 2015
3ef8116
add wrong key & wrong type tests
etpinard Jan 4, 2015
ec25258
add 2 insets tests
etpinard Jan 4, 2015
25c8d85
update 'specs' docstring
etpinard Jan 4, 2015
330eeac
raise Exception if specs dims not equal to 'rows' and 'columns'
etpinard Jan 4, 2015
12cdffd
rm 'is_empty' from SPEC_defaults
etpinard Jan 4, 2015
e52ff4f
add cond for spec == None case in check_and_fill
etpinard Jan 4, 2015
bad84cd
pep8 tuple
etpinard Jan 4, 2015
0c83b9d
move spec is None cond at top of spec loop
etpinard Jan 4, 2015
45229d2
re-align specs loop
etpinard Jan 5, 2015
fa286a0
move right by one column:
etpinard Jan 5, 2015
f0c3997
add under/over-specified specs tests
etpinard Jan 5, 2015
feea0cc
update tests:
etpinard Jan 5, 2015
98b955f
add a colspan>1 + rowspan>1 in the same cell test
etpinard Jan 5, 2015
e5d753f
[need some feedback] add start_cell docstring
etpinard Jan 5, 2015
0d74fb3
add back the old get_subplots :
etpinard Jan 6, 2015
6df366e
mv get_subplots argument checks tests to the top of file
etpinard Jan 6, 2015
5bcbaaa
move make_subplots tests to test_make_subplots.py
etpinard Jan 6, 2015
2edb810
pep8 get_subplots docstring
etpinard Jan 6, 2015
421dd5f
improve make_subplots docstring
etpinard Jan 7, 2015
af67e90
replace 'columns' with 'cols'
etpinard Jan 7, 2015
7bb6ba2
rm '>>>' in docstring
etpinard Jan 7, 2015
67672dd
force 'specs' to be list of lists
etpinard Jan 7, 2015
a311719
force items in 'specs' to be either dicts or None
etpinard Jan 7, 2015
dd16fa2
define START_CELL and build grid using it
etpinard Jan 7, 2015
254cf13
sub 'grid_str' -> 'grid_ref':
etpinard Jan 7, 2015
46b6c73
fill in a layout obj, not a figure obj directly
etpinard Jan 7, 2015
4a6b718
remove i, j indices
etpinard Jan 7, 2015
1cb0026
improve and generalize algorithm:
etpinard Jan 7, 2015
964daff
rm grid_str code (taken care outside specs loop now)
etpinard Jan 7, 2015
7463f60
update (r, c) convention:
etpinard Jan 7, 2015
f0eea15
update _add_domain (accepts layout not fig)
etpinard Jan 7, 2015
95cded8
update insets loop:
etpinard Jan 7, 2015
7b0e5d1
improve 'grid_str' code
etpinard Jan 7, 2015
3f7572a
pep8 and add TODO
etpinard Jan 7, 2015
e9c2e01
test galore !!!
etpinard Jan 7, 2015
bfa69ce
add exception for out of range 'insets.cell'
etpinard Jan 7, 2015
0f75a2d
add tests for prev commit
etpinard Jan 7, 2015
9c34d84
sync for graph ref (trace 'scene')
etpinard Jan 7, 2015
d39a0be
make print_grid=True the default for make_subplots
etpinard Jan 9, 2015
87d645a
sub '!' -> ':' in print grid msg
etpinard Jan 9, 2015
08892a9
update shared_{x,y}axes docstring
etpinard Jan 9, 2015
e4d4936
capitalize ROW_DIR
etpinard Jan 9, 2015
2de9ad7
update get_anchors logic:
etpinard Jan 9, 2015
bd16672
add shared axes tests
etpinard Jan 9, 2015
6b2465b
paste grid_ref and grid_str to fig in make_subplots
etpinard Jan 9, 2015
0437513
add print_grid method to Figure
etpinard Jan 9, 2015
9a2767b
add append_trace method to Figure
etpinard Jan 9, 2015
f13a408
make _grid_ref and _grid_str attributes
etpinard Jan 9, 2015
857013c
fix typo in exception msg
etpinard Jan 9, 2015
7e2d3e0
better test name
etpinard Jan 9, 2015
ff0a112
add exception for row/col =< 0
etpinard Jan 9, 2015
8dc3f80
add tests for append_trace
etpinard Jan 9, 2015
87501d8
force set axis.position when anchor == 'free'
etpinard Jan 9, 2015
cebfae2
update tests
etpinard Jan 9, 2015
68aee36
update make_subplot docstring
etpinard Jan 9, 2015
4ee9b59
add docstring to append_trace and print_grid
etpinard Jan 9, 2015
d2d7a92
add Exception if rows / cols <= 0
etpinard Jan 10, 2015
1f1960d
add tests about last commit
etpinard Jan 10, 2015
e0301ad
add example in Figure.append_trace docstring on ref in make_subplots
etpinard Jan 10, 2015
3ac711f
v 1.5.0
etpinard Jan 10, 2015
5536194
Merge branch 'master' into revamp-get_subplots
etpinard Jan 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove old get_subplots() code
  • Loading branch information
etpinard committed Dec 30, 2014
commit 1b1d23a56504f796fa5629332662f8a43c9b0f6d
29 changes: 0 additions & 29 deletions plotly/tools.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@ def mpl_to_plotly(fig, resize=False, strip_style=False, verbose=False):

### graph_objs related tools ###

# TODO: Scale spacing based on number of plots and figure size
def get_subplots(rows=1, columns=1,
shared_xaxes=False, shared_yaxes=False,
print_grid=False, **kwargs):
Expand Down Expand Up @@ -484,37 +483,9 @@ def get_subplots(rows=1, columns=1,
* b (float, default=0.0): padding bottom of cell
Copy link
Member

@chriddyp chriddyp Jan 5, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an example or two in here would be fantastic

Copy link
Contributor Author

@etpinard etpinard Jan 5, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

"""

fig = dict(layout=graph_objs.Layout()) # will return this at the end
plot_width = (1 - horizontal_spacing * (columns - 1)) / columns
plot_height = (1 - vertical_spacing * (rows - 1)) / rows
plot_num = 0
for rrr in range(rows):
for ccc in range(columns):
xaxis_name = 'xaxis{0}'.format(plot_num + 1)
x_anchor = 'y{0}'.format(plot_num + 1)
x_start = (plot_width + horizontal_spacing) * ccc
x_end = x_start + plot_width

yaxis_name = 'yaxis{0}'.format(plot_num + 1)
y_anchor = 'x{0}'.format(plot_num + 1)
y_start = (plot_height + vertical_spacing) * rrr
y_end = y_start + plot_height

xaxis = graph_objs.XAxis(domain=[x_start, x_end], anchor=x_anchor)
fig['layout'][xaxis_name] = xaxis
yaxis = graph_objs.YAxis(domain=[y_start, y_end], anchor=y_anchor)
fig['layout'][yaxis_name] = yaxis
plot_num += 1
if print_grid:
print("This is the format of your plot grid!")
grid_string = ""
plot = 1
for rrr in range(rows):
grid_line = ""
for ccc in range(columns):
grid_line += "[{0}]\t".format(plot)
plot += 1
grid_string = grid_line + '\n' + grid_string
print(grid_string)
return graph_objs.Figure(fig) # forces us to validate what we just did...

Expand Down

AltStyle によって変換されたページ (->オリジナル) /