Merge pull request #940 from ioam/dimension_range_fix

Ensured Dimensioned.range respects one-sided Dimension.range
holoviz · Oct 18, 2016 · 30f1237 · 30f1237
2 parents e833096 + fa5a1c8
commit 30f1237
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/holoviews/core/data/__init__.py b/holoviews/core/data/__init__.py
@@ -189,12 +189,11 @@ def range(self, dim, data_range=True):
         dim = self.get_dimension(dim)
         if None not in dim.range:
             return dim.range
-        elif dim in self.dimensions():
+        elif dim in self.dimensions() and data_range:
             if len(self):
                 drange = self.interface.range(self, dim)
             else:
                 drange = (np.NaN, np.NaN)
-        if data_range:
             soft_range = [r for r in dim.soft_range if r is not None]
             if soft_range:
                 drange = util.max_range([drange, soft_range])

diff --git a/holoviews/core/dimension.py b/holoviews/core/dimension.py
@@ -858,21 +858,30 @@ def range(self, dimension, data_range=True):
         dimension = self.get_dimension(dimension)
         if dimension is None:
             return (None, None)
-        if dimension.range != (None, None):
+        if None not in dimension.range:
             return dimension.range
-        elif not data_range:
-            return (None, None)
-        soft_range = [r for r in dimension.soft_range
-                      if r is not None]
-        if dimension in self.kdims or dimension in self.vdims:
-            dim_vals = self.dimension_values(dimension.name)
-            return find_range(dim_vals, soft_range)
-        dname = dimension.name
-        match_fn = lambda x: dname in x.dimensions(['key', 'value'], True)
-        range_fn = lambda x: x.range(dname)
-        ranges = self.traverse(range_fn, [match_fn])
-        drange = max_range(ranges)
-        return drange
+        elif data_range:
+            if dimension in self.kdims or dimension in self.vdims:
+                dim_vals = self.dimension_values(dimension.name)
+                drange = find_range(dim_vals)
+            else:
+                dname = dimension.name
+                match_fn = lambda x: dname in x.dimensions(['key', 'value'], True)
+                range_fn = lambda x: x.range(dname)
+                ranges = self.traverse(range_fn, [match_fn])
+                drange = max_range(ranges)
+            soft_range = [r for r in dimension.soft_range if r is not None]
+            if soft_range:
+                drange = util.max_range([drange, soft_range])
+        else:
+            drange = dim.soft_range
+        if dimension.range[0] is not None:
+            return (dimension.range[0], drange[1])
+        elif dimension.range[1] is not None:
+            return (drange[0], dimension.range[1])
+        else:
+            return drange
+
 
     def __repr__(self):
         reprval = PrettyPrinter.pprint(self)