MatplotLibAPI 3.2.5__py3-none-any.whl → 3.2.8__py3-none-any.whl

MatplotLibAPI/Composite.py

@@ -1,18 +1,17 @@
 # Hint for Visual Code Python Interactive window
 # %%
-from typing import Optional, Tuple,List,Union, Dict
+from typing import Optional, Tuple, List
 import pandas as pd
 import matplotlib.pyplot as plt
-from matplotlib.pyplot import GridSpec
 from matplotlib.figure import Figure
-from matplotlib.axes import Axes
-
+import plotly.graph_objects as go
+from plotly.subplots import make_subplots
 from .Bubble import aplot_bubble, BUBBLE_STYLE_TEMPLATE
 from .Table import aplot_table
+from .Treemap import aplot_treemap, TREEMAP_STYLE_TEMPLATE
 from .StyleTemplate import StyleTemplate, format_func, validate_dataframe
 
 
-
 def plot_composite_bubble(
         pd_df: pd.DataFrame,
         label: str,
@@ -44,17 +43,17 @@ def plot_composite_bubble(
     grid = plt.GridSpec(2, 2, height_ratios=[2, 1], width_ratios=[1, 1])
     ax = fig.add_subplot(grid[0, 0:])
     ax = aplot_bubble(pd_df=plot_df,
-                     label=label,
-                     x=x,
-                     y=y,
-                     z=z,
-                     title=title,
-                     style=style,
-                     max_values=max_values,
-                     center_to_mean=center_to_mean,
-                     sort_by=sort_by,
-                     ascending=ascending,
-                     ax=ax)
+                      label=label,
+                      x=x,
+                      y=y,
+                      z=z,
+                      title=title,
+                      style=style,
+                      max_values=max_values,
+                      center_to_mean=center_to_mean,
+                      sort_by=sort_by,
+                      ascending=ascending,
+                      ax=ax)
 
     if "label" in style.format_funcs:
         style.format_funcs[label] = style.format_funcs["label"]
@@ -90,3 +89,36 @@ def plot_composite_bubble(
     fig.tight_layout()
     return fig
 
+
+def plot_composite_treemap(pd_dfs: List[pd.DataFrame],
+                   path: str,
+                   values: str,
+                   style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+                   title: Optional[str] = None,
+                   color: Optional[str] = None,
+                   sort_by: Optional[str] = None,
+                   ascending: bool = False,
+                   max_values: int = 100) -> go.Figure:
+
+    num_dimensions = len(pd_dfs)
+    if num_dimensions > 0:
+        fig = make_subplots(
+            rows=num_dimensions,
+            cols=1,
+            specs=[[{'type': 'domain'}] for _ in range(num_dimensions)],
+            vertical_spacing=0.02
+        )
+        current_row = 1
+        for pd_df in pd_dfs:
+            trm = aplot_treemap(pd_df=pd_df,
+                                path=path,
+                                values=values,
+                                title=title,
+                                style=style,
+                                color=color,
+                                sort_by=sort_by,
+                                ascending=ascending,
+                                max_values=max_values)
+            fig.add_trace(trm,row=current_row, col=1)
+            current_row += 1
+        return fig

MatplotLibAPI/Treemap.py

@@ -2,11 +2,10 @@
 # %%
 from typing import Optional
 import pandas as pd
-from pandas import CategoricalDtype,BooleanDtype
+from pandas import CategoricalDtype, BooleanDtype
 import plotly.graph_objects as go
 
-from .StyleTemplate import StyleTemplate, string_formatter, percent_formatter,validate_dataframe
-
+from .StyleTemplate import StyleTemplate, string_formatter, percent_formatter, validate_dataframe
 
 
 TREEMAP_STYLE_TEMPLATE = StyleTemplate(
@@ -19,16 +18,15 @@ TREEMAP_STYLE_TEMPLATE = StyleTemplate(
 )
 
 
-def fplot_treemap(pd_df: pd.DataFrame,
-                 path: str,
-                 values: str,
-                 style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
-                 title: Optional[str] = None,
-                 color: Optional[str] = None,
-                 sort_by: Optional[str] = None,
-                 ascending: bool = False,
-                 max_values: int = 100,
-                 fig: Optional[go.Figure] = None) -> go.Figure:
+def aplot_treemap(pd_df: pd.DataFrame,
+                  path: str,
+                  values: str,
+                  style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+                  title: Optional[str] = None,
+                  color: Optional[str] = None,
+                  sort_by: Optional[str] = None,
+                  ascending: bool = False,
+                  max_values: int = 100) -> go.Trace:
     cols = [path, values]
     if color:
         cols.append(color)
@@ -57,7 +55,33 @@ def fplot_treemap(pd_df: pd.DataFrame,
         data['marker'] = dict(colorscale="Viridis",
                               colors=color_data.to_list())
 
-    g = go.Treemap(data)
+    g = go.Treemap(data,
+                   root_color=style.background_color
+                   )
+
+    return g
+
+
+def fplot_treemap(pd_df: pd.DataFrame,
+                  path: str,
+                  values: str,
+                  style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+                  title: Optional[str] = None,
+                  color: Optional[str] = None,
+                  sort_by: Optional[str] = None,
+                  ascending: bool = False,
+                  max_values: int = 100,
+                  fig: Optional[go.Figure] = None) -> go.Figure:
+
+    g = aplot_treemap(pd_df=pd_df,
+                      path=path,
+                      values=values,
+                      title=title,
+                      style=style,
+                      color=color,
+                      sort_by=sort_by,
+                      ascending=ascending,
+                      max_values=max_values)
 
     if not fig:
         fig = go.Figure(g)

MatplotLibAPI/__init__.py

@@ -5,7 +5,7 @@ from .Composite import plot_composite_bubble
 from .Timeserie import aplot_timeserie, fplot_timeserie, TIMESERIE_STYLE_TEMPLATE
 from .Table import aplot_table, fplot_table, TABLE_STYLE_TEMPLATE
 from .Network import aplot_network, aplot_network_components, fplot_network, NETWORK_STYLE_TEMPLATE
-from .Treemap import fplot_treemap, TREEMAP_STYLE_TEMPLATE
+from .Treemap import fplot_treemap, aplot_treemap, TREEMAP_STYLE_TEMPLATE
 from typing import List, Optional, Tuple
 import pandas as pd
 from pandas.api.extensions import register_dataframe_accessor
@@ -106,13 +106,13 @@ class DataFrameAccessor:
                                      ascending=ascending)
 
     def aplot_table(self,
-                       cols: List[str],
-                       title: Optional[str] = None,
-                       style: StyleTemplate = TABLE_STYLE_TEMPLATE,
-                       max_values: int = 20,
-                       sort_by: Optional[str] = None,
-                       ascending: bool = False,
-                       ax: Optional[Axes] = None) -> Axes:
+                    cols: List[str],
+                    title: Optional[str] = None,
+                    style: StyleTemplate = TABLE_STYLE_TEMPLATE,
+                    max_values: int = 20,
+                    sort_by: Optional[str] = None,
+                    ascending: bool = False,
+                    ax: Optional[Axes] = None) -> Axes:
 
         return aplot_table(pd_df=self._obj,
                            cols=cols,
@@ -259,19 +259,41 @@ class DataFrameAccessor:
                       style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
                       title: Optional[str] = None,
                       color: Optional[str] = None,
-                      max_values: int = 100,
                       sort_by: Optional[str] = None,
-                      ascending: bool = False) -> go.Figure:
+                      max_values: int = 100,
+                      ascending: bool = False,
+                      fig: Optional[go.Figure] = None) -> go.Figure:
         return fplot_treemap(pd_df=self._obj,
                              path=path,
                              values=values,
                              title=title,
                              style=style,
                              color=color,
+                             sort_by=sort_by,
+                             ascending=ascending,
                              max_values=max_values,
+                             fig=fig)
+
+    def aplot_treemap(self,
+                      path: str,
+                      values: str,
+                      style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+                      title: Optional[str] = None,
+                      color: Optional[str] = None,
+                      sort_by: Optional[str] = None,
+                      max_values: int = 100,
+                      ascending: bool = False,
+                      fig: Optional[go.Figure] = None) -> go.Figure:
+        return aplot_treemap(pd_df=self._obj,
+                             path=path,
+                             values=values,
+                             title=title,
+                             style=style,
+                             color=color,
                              sort_by=sort_by,
-                             ascending=ascending)
+                             ascending=ascending,
+                             max_values=max_values)
 
 
 __all__ = ["validate_dataframe", "aplot_bubble", "aplot_timeserie", "aplot_table", "aplot_network", "aplot_network_components", "fplot_network",
-           "plot_pivotbar", "fplot_treemap", "plot_composite_bubble", "StyleTemplate", "DataFrameAccessor"]
+           "plot_pivotbar", "fplot_treemap", "aplot_treemap", "plot_composite_bubble", "StyleTemplate", "DataFrameAccessor"]

{MatplotLibAPI-3.2.5.dist-info → MatplotLibAPI-3.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MatplotLibAPI
-Version: 3.2.5
+Version: 3.2.8
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE

{MatplotLibAPI-3.2.5.dist-info → MatplotLibAPI-3.2.8.dist-info}/RECORD

@@ -1,14 +1,14 @@
 MatplotLibAPI/Bubble.py,sha256=ZtOTWGAnJ1zy7bjKQ3OF985R-iZHvZOo_rG1dZMbP-Q,5116
-MatplotLibAPI/Composite.py,sha256=ttcgB_6GiZJKTX-Cmai6MEXrpw1_MuLN9uzDj36v7JA,2889
+MatplotLibAPI/Composite.py,sha256=YpC4VxYX4nMgiiV8ic734c_NGaCTdQCptT8bpMdTqCQ,4222
 MatplotLibAPI/Network.py,sha256=zzizLBAMD-nV-1WGZTIoOQn3SVsvr9R8Ba2DTCyuTvA,18790
 MatplotLibAPI/Pivot.py,sha256=Bo7ZpkxqoE75e8vpSsKIT5X2Q7lLdfAyy46ox1fARbc,7183
 MatplotLibAPI/StyleTemplate.py,sha256=va8_yXaun1RnjQUOEHGvsXJrKWHdzz4BhnY0CkROLW8,4599
 MatplotLibAPI/Table.py,sha256=p_nHXRiC6dneBSf0j5nx-hBijBSXd7NBLmdBicFUGqQ,2809
 MatplotLibAPI/Timeserie.py,sha256=B03xjcBCgWVpkDQKvoyGtNjm6OLtCo1fINyXJrXeWM8,4952
-MatplotLibAPI/Treemap.py,sha256=1QqBnV1EUzDHPSnp90n3TQKLZMuTymaJFZIdVJQqdjI,2553
-MatplotLibAPI/__init__.py,sha256=ffrsuKX4n_eLcCV8YZuSKyCkPbXvCng5wgNI9XUijfw,11928
-MatplotLibAPI-3.2.5.dist-info/LICENSE,sha256=hMErKLb6YZR3lRR5zr-vxeFkvY69QAaafgSpZ5-P1dQ,1067
-MatplotLibAPI-3.2.5.dist-info/METADATA,sha256=dkn6Fpfe9Yzx9gyQrisQXTeQAu9GLhrFPiSztwyMf7Y,462
-MatplotLibAPI-3.2.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-MatplotLibAPI-3.2.5.dist-info/top_level.txt,sha256=MrzbBjDEW48Vb6YhQIqpFYGOhHzQnEIM5Qy2xy2iqew,14
-MatplotLibAPI-3.2.5.dist-info/RECORD,,
+MatplotLibAPI/Treemap.py,sha256=1WYHV9eaU4zcXrwTIScQvsGrfgiuYg-aAoeIhTZVPKw,3395
+MatplotLibAPI/__init__.py,sha256=-NgOIPG0P7G4pllESRsrOzcKgT0u-ZSE04AHRk-8Aas,12918
+MatplotLibAPI-3.2.8.dist-info/LICENSE,sha256=hMErKLb6YZR3lRR5zr-vxeFkvY69QAaafgSpZ5-P1dQ,1067
+MatplotLibAPI-3.2.8.dist-info/METADATA,sha256=X-bNBBQloDBC8Np3t6YsFWi3AjJ3AG_OOH9GdEJAudU,462
+MatplotLibAPI-3.2.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+MatplotLibAPI-3.2.8.dist-info/top_level.txt,sha256=MrzbBjDEW48Vb6YhQIqpFYGOhHzQnEIM5Qy2xy2iqew,14
+MatplotLibAPI-3.2.8.dist-info/RECORD,,