Skip to content
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

Replace bkcharts based BoxWhisker with pure bokeh implementation #1604

Merged
merged 19 commits into from Jun 25, 2017
Merged
Diff settings

Always

Just for now

@@ -17,12 +17,11 @@
DFrame = None

from .annotation import TextPlot, LineAnnotationPlot, SplinePlot
from .bkcharts import BoxPlot
from .callbacks import Callback # noqa (API import)
from .element import OverlayPlot, ElementPlot
from .chart import (PointPlot, CurvePlot, SpreadPlot, ErrorPlot, HistogramPlot,
SideHistogramPlot, BarPlot, SpikesPlot, SideSpikesPlot,
AreaPlot, VectorFieldPlot)
AreaPlot, VectorFieldPlot, BoxWhiskerPlot)
from .path import PathPlot, PolygonPlot, ContourPlot
from .plot import GridPlot, LayoutPlot, AdjointLayoutPlot
from .raster import RasterPlot, RGBPlot, HeatmapPlot, HSVPlot, QuadMeshPlot
@@ -46,6 +45,8 @@

# Charts
Curve: CurvePlot,
Bars: BarPlot,
BoxWhisker: BoxWhiskerPlot,
Points: PointPlot,
Scatter: PointPlot,
ErrorBars: ErrorPlot,
@@ -95,12 +96,6 @@
AdjointLayoutPlot.registry[Histogram] = SideHistogramPlot
AdjointLayoutPlot.registry[Spikes] = SideSpikesPlot

try:
import pandas # noqa (Conditional import)
Store.register({BoxWhisker: BoxPlot,
Bars: BarPlot}, 'bokeh')
except ImportError:
pass

point_size = np.sqrt(6) # Matches matplotlib default
Cycle.default_cycles['default_colors'] = ['#30a2da', '#fc4f30', '#e5ae38',
@@ -111,6 +106,8 @@

# Charts
options.Curve = Options('style', color=Cycle(), line_width=2)
options.BoxWhisker = Options('style', box_fill_color=Cycle(), whisker_color='black',
box_line_color='black', outlier_color='black')
options.Scatter = Options('style', color=Cycle(), size=point_size, cmap=dflt_cmap)
options.Points = Options('style', color=Cycle(), size=point_size, cmap=dflt_cmap)
options.Histogram = Options('style', line_color='black', fill_color=Cycle())

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.