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.

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

ENH: make data the first argument of all chart objects #895

Merged
merged 1 commit into from
May 23, 2018
Merged

ENH: make data the first argument of all chart objects #895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions altair/vegalite/v2/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,9 +1180,9 @@ def _check_if_valid_subspec(spec, classname):
@utils.use_signature(core.TopLevelRepeatSpec)
class RepeatChart(TopLevelMixin, core.TopLevelRepeatSpec):
"""A chart repeated across rows and columns with small changes"""
def __init__(self, spec=Undefined, data=Undefined, repeat=Undefined, **kwargs):
def __init__(self, data=Undefined, spec=Undefined, repeat=Undefined, **kwargs):
_check_if_valid_subspec(spec, 'RepeatChart')
super(RepeatChart, self).__init__(spec=spec, data=data, repeat=repeat, **kwargs)
super(RepeatChart, self).__init__(data=data, spec=spec, repeat=repeat, **kwargs)

def interactive(self, name=None, bind_x=True, bind_y=True):
"""Make chart axes scales interactive
Expand Down Expand Up @@ -1229,11 +1229,11 @@ def repeat(repeater):
@utils.use_signature(core.TopLevelHConcatSpec)
class HConcatChart(TopLevelMixin, core.TopLevelHConcatSpec):
"""A chart with horizontally-concatenated facets"""
def __init__(self, hconcat=(), **kwargs):
def __init__(self, data=Undefined, hconcat=(), **kwargs):
# TODO: move common data to top level?
for spec in hconcat:
_check_if_valid_subspec(spec, 'HConcatChart')
super(HConcatChart, self).__init__(hconcat=list(hconcat), **kwargs)
super(HConcatChart, self).__init__(data=data, hconcat=list(hconcat), **kwargs)

def __ior__(self, other):
_check_if_valid_subspec(other, 'HConcatChart')
Expand All @@ -1257,11 +1257,11 @@ def hconcat(*charts, **kwargs):
@utils.use_signature(core.TopLevelVConcatSpec)
class VConcatChart(TopLevelMixin, core.TopLevelVConcatSpec):
"""A chart with vertically-concatenated facets"""
def __init__(self, vconcat=(), **kwargs):
def __init__(self, data=Undefined, vconcat=(), **kwargs):
# TODO: move common data to top level?
for spec in vconcat:
_check_if_valid_subspec(spec, 'VConcatChart')
super(VConcatChart, self).__init__(vconcat=list(vconcat), **kwargs)
super(VConcatChart, self).__init__(data=data, vconcat=list(vconcat), **kwargs)

def __iand__(self, other):
_check_if_valid_subspec(other, 'VConcatChart')
Expand Down Expand Up @@ -1356,9 +1356,9 @@ def layer(*charts, **kwargs):
@utils.use_signature(core.TopLevelFacetSpec)
class FacetChart(TopLevelMixin, core.TopLevelFacetSpec):
"""A Chart with layers within a single panel"""
def __init__(self, spec, facet=Undefined, **kwargs):
def __init__(self, data=Undefined, spec=Undefined, facet=Undefined, **kwargs):
_check_if_valid_subspec(spec, 'FacetChart')
super(FacetChart, self).__init__(spec=spec, facet=facet, **kwargs)
super(FacetChart, self).__init__(data=data, spec=spec, facet=facet, **kwargs)

def interactive(self, name=None, bind_x=True, bind_y=True):
"""Make chart axes scales interactive
Expand Down