Skip to content

Commit

Permalink
Implemented NdElement constructor conversions
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Jun 10, 2015
1 parent 4cf0922 commit cdaab4e
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions holoviews/core/element.py
Expand Up @@ -193,8 +193,21 @@ class NdElement(Element, NdMapping):

_deep_indexable = False

def __init__(self, data=None, **params):
NdMapping.__init__(self, data, **dict(params, group=params.get('group',self.group)))
def __init__(self, data, **params):
if isinstance(data, Element):
data = data.table()
elif isinstance(data, list) and all(np.isscalar(el) for el in data):
data = OrderedDict(list(((k,), v) for k, v in enumerate(data)))
super(NdElement, self).__init__(data, **params)


def _convert_element(self, element):
if isinstance(element, NdElement):
return element.data
if isinstance(element, Element):
return element.table().data
else: return element


def reindex(self, kdims, vdims=None):
"""
Expand Down

0 comments on commit cdaab4e

Please sign in to comment.