Skip to content

Changed integer based indexing to location based index #781

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.

Sign up for GitHub

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

Closed
wants to merge 5 commits into from
Closed

Changed integer based indexing to location based index #781

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
738065e
Changed integer based indexing to location based index
alishobeiri Jun 23, 2017
42c0d99
Update _facet_grid.py
alishobeiri Jun 23, 2017
b0da3c6
Reverted commit that was wrong
alishobeiri Jun 23, 2017
76d9d17
kwargs is undefined, I think it should be kwargs_trace
alishobeiri Jun 26, 2017
fb39dfe
Update _facet_grid.py
alishobeiri Jun 26, 2017
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
6 changes: 3 additions & 3 deletions plotly/figure_factory/_facet_grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ def _facet_grid_color_numerical(df, x, y, facet_row, facet_col, color_name,
mode='markers',
type=trace_type,
showlegend=False,
**kwargs
**kwargs_trace
Copy link
Contributor

Choose a reason for hiding this comment

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

good catch

)
fig.append_trace(trace, row_count + 1, col_count + 1)
if row_count == 0:
Expand Down Expand Up @@ -783,7 +783,7 @@ def create_facet_grid(df, x, y, facet_row=None, facet_col=None,
)
show_legend = False
if color_name:
if isinstance(df[color_name][0], str) or color_is_cat:
if isinstance(df[color_name].iloc[0], str) or color_is_cat:
Copy link
Member

Choose a reason for hiding this comment

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

are there other places in the code where this happens?

Copy link
Contributor

Choose a reason for hiding this comment

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

@alishobeiri There's a elif isinstance(df[color_name][0], Number): line a little further down the code that you can change too.

Thanks for doing this! Awesome stuff.

show_legend = True
if isinstance(colormap, dict):
utils.validate_colors_dict(colormap, 'rgb')
Expand Down Expand Up @@ -812,7 +812,7 @@ def create_facet_grid(df, x, y, facet_row=None, facet_col=None,
marker_color, kwargs_trace, kwargs_marker
)

elif isinstance(df[color_name][0], Number):
elif isinstance(df[color_name].iloc[0], Number):
if isinstance(colormap, dict):
show_legend = True
utils.validate_colors_dict(colormap, 'rgb')
Expand Down