From cdaab4e1e455df27ea672d33e727176cf0a4ce9d Mon Sep 17 00:00:00 2001
From: philippjfr
Date: Wed, 10 Jun 2015 12:20:12 +0100
Subject: [PATCH] Implemented NdElement constructor conversions
---
holoviews/core/element.py | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/holoviews/core/element.py b/holoviews/core/element.py
index 3db27b424b..9e5e6b0ba4 100644
--- a/holoviews/core/element.py
+++ b/holoviews/core/element.py
@@ -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):
"""