Skip to content

Commit

Permalink
Merge 3a10f08 into 13d56d1
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Jun 11, 2020
2 parents 13d56d1 + 3a10f08 commit ebc22fd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion examples/user_guide/08-Tabular_Datasets.ipynb
Expand Up @@ -480,7 +480,8 @@
"(bars +\n",
" bars.sort().relabel('sorted') +\n",
" bars.sort(['y']).relabel('y-sorted') +\n",
" bars.sort(reverse=True).relabel('reverse sorted')).cols(2)"
" bars.sort(reverse=True).relabel('reverse sorted')\n",
").opts(shared_axes=False).cols(2)"
]
},
{
Expand Down
7 changes: 4 additions & 3 deletions examples/user_guide/Customizing_Plots.ipynb
Expand Up @@ -32,6 +32,7 @@
" - [Titles](#Title): Using title formatting and providing custom titles\n",
" - [Background](#Background): Setting the plot background color\n",
" - [Font sizes](#Font-sizes): Controlling the font sizes on a plot\n",
" - [Legends](#Legend-customization): Controlling the position and styling of the legend\n",
" - [Plot hooks](#Plot-hooks): Using custom hooks to modify plots\n",
"* [**Axes**](#Customizing-axes): A set of axes provides scales describing the mapping between data and the space on screen\n",
" - [Types of axes](#Types-of-axes):\n",
Expand Down Expand Up @@ -158,7 +159,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Applying customizations to legends\n",
"### Legend customization\n",
"\n",
"When overlaying plots with different labels, a legend automatically appears to differentiate elements in the overlay. This legend can be customized in several ways:\n",
"\n",
Expand All @@ -167,7 +168,7 @@
" - by adjusting the legend location *outside* of the figure using the `legend_position` and `legend_offset` parameters (which then positions the legend in *screen* space) (e.g. `legend_position='right', legend_offset=(0, 200)`). **Note**: the `legend_position` option applies to `bokeh` and `matplotlib` backends but the `legend_offset` only applies to `bokeh`.\n",
"- by **style**\n",
" - by muting elements with `legend_muted=True` (applies only to the `bokeh` backend)\n",
" - by putting the legend elements in a column layout with `legend_cols=True` (applies only to the `bokeh` backend)\n",
" - by putting the legend elements in a column layout with `legend_cols=True` or (`legend_cols=int` in matplotlib)\n",
" \n",
"These customizations are demonstrated by the examples that follow.\n",
"\n",
Expand Down Expand Up @@ -229,7 +230,7 @@
"metadata": {},
"outputs": [],
"source": [
"overlay.opts(legend_muted=True, legend_cols=True)"
"overlay.opts(legend_muted=True, legend_cols=2)"
]
},
{
Expand Down
3 changes: 2 additions & 1 deletion holoviews/plotting/bokeh/selection.py
Expand Up @@ -72,6 +72,7 @@ def _style_region_element(self, region_element, unselected_color):
if 'alpha' in opt_name:
options[opt_name] = 1.0

print(el2_name)
if el1_name != "Histogram":
# Darken unselected color
if unselected_color:
Expand Down Expand Up @@ -99,5 +100,5 @@ def _style_region_element(self, region_element, unselected_color):

region = region_element.opts(el1_name, clone=True, **options)
if el2_name and el2_name == 'Path':
region = region.opts(el2_name, backend='bokeh', color='black')
region = region.opts(el2_name, backend='bokeh', color='black', line_dash='dotted')
return region
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -95,7 +95,7 @@
'nbsite >0.5.2',
'sphinx',
'sphinx_holoviz_theme',
'mpl_sample_data >=3.2.1',
'mpl_sample_data >=3.1.3',
'awscli',
'pscript',
'graphviz'
Expand Down

0 comments on commit ebc22fd

Please sign in to comment.