lets-plot 4.3.3__cp38-cp38-win_amd64.whl → 4.4.0rc1__cp38-cp38-win_amd64.whl

lets_plot/plot/__init__.py

@@ -13,6 +13,7 @@ from .geom_function_ import *
 from .geom_imshow_ import *
 from .geom_livemap_ import *
 from .gggrid_ import *
+from .ggtb_ import *
 from .guide import *
 from .label import *
 from .marginal_layer import *
@@ -20,6 +21,7 @@ from .plot import *
 from .pos import *
 from .sampling import *
 from .scale import *
+from .scale_colormap_mpl import *
 from .scale_convenience import *
 from .scale_identity_ import *
 from .scale_position import *
@@ -42,6 +44,7 @@ __all__ = (coord.__all__ +
            pos.__all__ +
            sampling.__all__ +
            scale.__all__ +
+           scale_colormap_mpl.__all__ +
            scale_convenience.__all__ +
            scale_identity_.__all__ +
            scale_position.__all__ +
@@ -52,5 +55,6 @@ __all__ = (coord.__all__ +
            annotation.__all__ +
            marginal_layer.__all__ +
            font_features.__all__ +
-           gggrid_.__all__
+           gggrid_.__all__ +
+           ggtb_.__all__
            )

lets_plot/plot/annotation.py

@@ -109,10 +109,9 @@ class layer_labels(FeatureSpec):
         --------
         .. jupyter-execute::
             :linenos:
-            :emphasize-lines: 8
+            :emphasize-lines: 7
 
             from lets_plot import *
-            from lets_plot.mapping import *
             LetsPlot.setup_html()
             data = {'name': ['a', 'b', 'c', 'd', 'b'], 'value': [40, 90, 10, 50, 20 ] }
             ggplot(data) + geom_pie(aes(fill=as_discrete('name', order_by='..count..'), weight='value'), \\
@@ -124,10 +123,9 @@ class layer_labels(FeatureSpec):
 
         .. jupyter-execute::
             :linenos:
-            :emphasize-lines: 8, 10, 12, 14
+            :emphasize-lines: 7, 9, 11, 13
 
             from lets_plot import *
-            from lets_plot.mapping import *
             LetsPlot.setup_html()
             data = {'name': ['a', 'b', 'c', 'd', 'b'], 'value': [40, 90, 10, 50, 20 ] }
             ggplot(data) + geom_pie(aes(fill=as_discrete('name', order_by='..count..', order=1), weight='value'), \\

lets_plot/plot/coord.py

@@ -218,11 +218,10 @@ def coord_polar(xlim=None, ylim=None, theta=None, start=None, direction=None, tr
     --------
     .. jupyter-execute::
         :linenos:
-        :emphasize-lines: 14
+        :emphasize-lines: 13
 
         import numpy as np
         from lets_plot import *
-        from lets_plot.mapping import as_discrete
         LetsPlot.setup_html()
         np.random.seed(42)
         n = 20

lets_plot/plot/core.py

@@ -162,7 +162,7 @@ class FeatureSpec():
 
     Do not use this class explicitly.
 
-    Instead you should construct its objects with functions `ggplot()`, `geom_point()`,
+    Instead, you should construct its objects with functions `ggplot()`, `geom_point()`,
     `position_dodge()`, `scale_x_continuous()` etc.
     """
 
@@ -175,26 +175,6 @@ class FeatureSpec():
         self.__props.update(**kwargs)
 
     def props(self):
-        """
-        Return the dictionary of all properties of the object in their initial form.
-
-        Returns
-        -------
-        dict
-            Dictionary of properties.
-
-        Examples
-        --------
-        .. jupyter-execute::
-            :linenos:
-            :emphasize-lines: 4
-
-            from lets_plot import *
-            LetsPlot.setup_html()
-            p = ggplot({'x': [0], 'y': [0]}) + geom_point(aes('x', 'y'))
-            p.props()
-
-        """
         return self.__props
 
     def as_dict(self):
@@ -228,16 +208,16 @@ class FeatureSpec():
             # nothing
             return self
 
-        """
-            self + plot -> fail
-            self + other_feature -> [self,other_feature]
-        """
-        if isinstance(other, PlotSpec):
-            # pass and fail
+        if self.kind in ["plot", "subplots"]:
+            # pass and fail: don't allow to add plot to a feature list.
             pass
-        if isinstance(other, FeatureSpec):
-            arr = FeatureSpecArray(self, other)
-            return arr
+        elif isinstance(other, FeatureSpec):
+            if other.kind in ["plot", "subplots"]:
+                # pass and fail: don't allow to add plot to a feature list.
+                pass
+            else:
+                arr = FeatureSpecArray(self, other)
+                return arr
 
         raise TypeError('unsupported operand type(s) for +: {} and {}'
                         .format(self.__class__, other.__class__))
@@ -416,6 +396,11 @@ class PlotSpec(FeatureSpec):
                     plot = plot.__add__(spec)
                 return plot
 
+            if other.kind == 'guides':
+                existing_guides_options = plot.props().get('guides', {})
+                plot.props()['guides'] = _merge_dicts_recursively(existing_guides_options, other.as_dict())
+                return plot
+
             # add feature to properties
             plot.props()[other.kind] = other
             return plot
@@ -829,6 +814,16 @@ def _generate_data(size):
     return PlotSpec(data='x' * size, mapping=None, scales=[], layers=[])
 
 
+def _merge_dicts_recursively(d1, d2):
+    merged = d1.copy()
+    for key, value in d2.items():
+        if isinstance(value, dict) and isinstance(merged.get(key), dict):
+            merged[key] = _merge_dicts_recursively(merged[key], value)
+        else:
+            merged[key] = value
+    return merged
+
+
 def _theme_dicts_merge(x, y):
     """
     Simple values in `y` override values in `x`.