lessPython 0.2.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

lessPy/bc_items_plotly.py

@@ -20,7 +20,7 @@ from .utils import get_option, pretty
 from .plotly_utils import (
     as_plotly_color, auto_text_color, axis_cat, axis_format,
     axis_num, legend_style, plot_border, plotly_style, to_hex,
-    x_grid,
+    x_grid, y_grid,
 )
 
 # theme -> the two sequential palettes of the divergent fill
@@ -91,24 +91,31 @@ def items_table(cols, names):
     return frq, wm, numeric
 
 
-def items_stats_lines(frq, wm, title, numeric=True):
+def items_stats_lines(frq, wm, title, numeric=True, with_sum=False):
     """'Frequencies of Responses by Variable': one row per item,
     its counts and its mean. R analog: .prntbl(t(x), 0) with the
-    Mean column of .bc.main() multi"""
-    t = frq.T
+    Mean column of .bc.main() multi. with_sum adds the Sum column of
+    the bubble plot frequency matrix, whose Mean column follows at
+    one space and is sized to the mean at three decimals, as
+    .dpmat.main() writes it"""
+    t = frq.T.copy()
+    if with_sum:
+        t["Sum"] = t.sum(axis=1)
     rows = [str(r) for r in t.index]
     max_c1 = max(len(r) for r in rows) + 2
     widths = [max(4, max(len(str(c)),
                          max(len(f"{v:.0f}") for v in t[c])) + 1)
               for c in t.columns]
-    mx = max(len(f"{round(v, 2):.15g}") for v in wm if np.isfinite(v))
+    mx = max(len(f"{round(v, 3 if with_sum else 2):.15g}")
+             for v in wm if np.isfinite(v))
+    sep = " " if with_sum else "   "
     hdr = " " * max_c1 + "".join(str(c).rjust(w)
                                  for c, w in zip(t.columns, widths))
-    lines = [title, "", hdr + "   " + "Mean".rjust(mx + 1)]
+    lines = [title, "", hdr + sep + "Mean".rjust(mx + 1)]
     for r in t.index:
         ln = ("  " + str(r)).rjust(max_c1) + "".join(
             f"{v:.0f}".rjust(w) for v, w in zip(t.loc[r], widths))
-        lines.append(ln + "   " + f"{wm[r]:.3f}".rjust(mx + 1))
+        lines.append(ln + sep + f"{wm[r]:.3f}".rjust(mx + 1))
     if not numeric:
         lines += ["", "Computation of the mean based on coding "
                   "response categories from 1 to "
@@ -120,9 +127,11 @@ def bc_items_plotly(frq, order, fill, labels="%", labels_size=None,
                     labels_cut=0.04, stack100=False, x_lab="",
                     y_lab="", legend_title="Responses", main=None,
                     digits_d=0, axis_fmt="K", axis_x_pre="",
-                    rotate_x=0, rotate_y=0, style_opts=None):
-    """One horizontal bar per item, stacked by response. frq:
-    responses x items counts; order: the items bottom to top."""
+                    rotate_x=0, rotate_y=0, horiz=True,
+                    style_opts=None):
+    """One bar per item, stacked by response. frq: responses x items
+    counts; order: the items bottom to top, or left to right when
+    horiz=False (the vertical chart)."""
     if style_opts is None:
         style_opts = plotly_style()
     cnt = frq[order].to_numpy(dtype=float)
@@ -147,7 +156,9 @@ def bc_items_plotly(frq, order, fill, labels="%", labels_size=None,
                     f"{c:.0f}")
                    for s, c in zip(share[i], cnt[i])]
         fig.add_trace(go.Bar(
-            x=mat[i], y=list(order), orientation="h", name=str(r),
+            x=mat[i] if horiz else list(order),
+            y=list(order) if horiz else mat[i],
+            orientation="h" if horiz else "v", name=str(r),
             marker=dict(color=fills[i % len(fills)],
                         line=dict(width=0)),
             text=txt, textposition="inside",
@@ -155,7 +166,8 @@ def bc_items_plotly(frq, order, fill, labels="%", labels_size=None,
             textfont=dict(size=txt_size,
                           color=txt_cols[i % len(txt_cols)]),
             customdata=np.stack([cnt[i], share[i]], axis=-1),
-            hovertemplate=(f"%{{y}}<br>{legend_title}: {r}"
+            hovertemplate=(("%{y}" if horiz else "%{x}")
+                           + f"<br>{legend_title}: {r}"
                            "<br>Count: %{customdata[0]:.0f}"
                            "<br>% of item: %{customdata[1]:.1%}"
                            "<extra></extra>"),
@@ -167,11 +179,12 @@ def bc_items_plotly(frq, order, fill, labels="%", labels_size=None,
         d = 2
     else:
         d = digits_d
-    x_ax = axis_num(x_lab, axT, axis_format(axT, d, axis_fmt,
-                                            axis_x_pre))
-    x_ax.update(range=[0, axT[-1] * (1 if stack100 else 1.02)])
-    y_ax = axis_cat(y_lab)
-    y_ax.update(categoryorder="array", categoryarray=list(order))
+    val_ax = axis_num(x_lab if horiz else y_lab, axT,
+                      axis_format(axT, d, axis_fmt, axis_x_pre))
+    val_ax.update(range=[0, axT[-1] * (1 if stack100 else 1.02)])
+    cat_ax = axis_cat(y_lab if horiz else x_lab)
+    cat_ax.update(categoryorder="array", categoryarray=list(order))
+    x_ax, y_ax = (val_ax, cat_ax) if horiz else (cat_ax, val_ax)
     if rotate_x:
         x_ax["tickangle"] = -rotate_x
     if rotate_y:
@@ -181,10 +194,10 @@ def bc_items_plotly(frq, order, fill, labels="%", labels_size=None,
     fig.update_layout(
         barmode="stack", bargap=0.2,
         xaxis=x_ax, yaxis=y_ax,
-        shapes=x_grid(axT) + plot_border(),
+        shapes=(x_grid(axT) if horiz else y_grid(axT)) + plot_border(),
         legend=leg, template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
     if main:
         title_size = round(16 * get_option("main_size", 1))

lessPy/bc_plotly.py

@@ -475,8 +475,8 @@ def bc_plotly(x, x_name=None, y_name=None, by_name=None,
         plt.update_layout(bargroupgap=bargroupgap)
 
     plt.update_layout(
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
 
     if by_name:
@@ -506,7 +506,7 @@ def bc_facet_plotly(x, x_name=None, facet_name=None,
                     n_col=1, axis_fmt="K", axis_x_pre="",
                     rotate_x=0, rotate_y=0,
                     by_tbls=None, by_name=None, beside=False,
-                    val_name=None, legend_title=None,
+                    val_name=None, legend_title=None, horiz=True,
                     style_opts=None):
     """Faceted bar chart: one panel per facet level, on a shared
     value axis with horizontal bars, as in the lattice Trellis bar
@@ -586,7 +586,8 @@ def bc_facet_plotly(x, x_name=None, facet_name=None,
                  f"<br>{facet_name}: {lv}")
                 for cc, v in zip(cats, row)]
             fig.add_trace(go.Bar(
-                x=row, y=cats, orientation="h",
+                x=row if horiz else cats, y=cats if horiz else row,
+                orientation="h" if horiz else "v",
                 marker=dict(color=fill_vec, opacity=alpha_fill,
                             line=dict(color=border_vec, width=1)),
                 hoverinfo="text", hovertext=hover,
@@ -604,24 +605,40 @@ def bc_facet_plotly(x, x_name=None, facet_name=None,
                  f"<br>{facet_name}: {lv}")
                 for cc, v in zip(cats, vals)]
             fig.add_trace(go.Bar(
-                x=vals, y=cats, orientation="h", name=b,
+                x=vals if horiz else cats, y=cats if horiz else vals,
+                orientation="h" if horiz else "v", name=b,
                 legendgroup=b, showlegend=(i == 0),
                 marker=dict(color=clr, opacity=alpha_fill,
                             line=dict(color=brd, width=1)),
                 hoverinfo="text", hovertext=hover,
             ), row=r, col=c)
 
-    finish_facet(fig, fac_levels, ax, x_lab, y_lab, gridT1=axT1,
-                 style_opts=style_opts, y_cat=cats, n_col=n_col)
+    if horiz:
+        finish_facet(fig, fac_levels, ax, x_lab, y_lab, gridT1=axT1,
+                     style_opts=style_opts, y_cat=cats, n_col=n_col)
+    else:
+        # the vertical chart: categories along x, the shared value
+        #   scale up the side of every panel
+        finish_facet(fig, fac_levels,
+                     {"axT2": axT1, "axL2": ax["axL1"]},
+                     y_lab, x_lab, gridT1=None, style_opts=style_opts,
+                     n_col=n_col, x_cat=cats)
     if grouped:
         fig.update_layout(
             barmode="group" if beside else "stack",
             showlegend=True,
             legend=dict(title=dict(text=(legend_title
                                          if legend_title is not None
-                                         else by_name)),
+                                         else by_name),
+                                   font=dict(color=as_plotly_color(
+                                       style_opts["lab_color"]))),
+                        font=dict(color=as_plotly_color(
+                            style_opts["lab_color"])),
                         traceorder="normal"))
-    fig.update_xaxes(range=[axT1[0], axT1[-1]])   # includes zero
+    if horiz:
+        fig.update_xaxes(range=[axT1[0], axT1[-1]])   # includes zero
+    else:
+        fig.update_yaxes(range=[axT1[0], axT1[-1]])
     if rotate_x:
         fig.update_xaxes(tickangle=-rotate_x)
     if rotate_y:
@@ -633,7 +650,7 @@ def bc_facet_plotly(x, x_name=None, facet_name=None,
             title=dict(text=main, x=0.5, xanchor="center",
                        y=0.99, yanchor="top",
                        font=dict(size=title_size,
-                                 color=to_hex(get_option(
+                                 color=as_plotly_color(get_option(
                                      "lab_color", "black")))),
             margin=dict(t=round(title_size * 2.2)))
     return fig

lessPy/bubble_plotly.py

@@ -22,6 +22,7 @@ import plotly.graph_objects as go
 
 from .utils import fmt, get_option
 from .plotly_utils import (
+    as_plotly_color,
     BASE_COLORS, contrast_text_for_hex, facet_layout, make_trans,
     plotly_style, to_hex,
 )
@@ -63,6 +64,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                   labels_decimals=None,
                   label_min_px=26, label_autocontrast=True,
                   facet_tbls=None, facet_name=None, n_col=None,
+                  shares=False, label_min_value=None,
                   style_opts=None):
 
     if labels is None:
@@ -98,8 +100,11 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
 
     # "prop" plots proportions, which digits_d (0 for counts)
     # would flatten to "0"
+    # a percentage of a proportion reads in whole numbers, as the
+    #   percentages of counts do
     lbl_d = (int(labels_decimals) if labels_decimals is not None
              else (2 if labels == "prop"
+                   else 0 if (shares and labels == "%")
                    else max(0, int(digits_d))))
     trace_mode = "markers" if labels == "off" else "markers+text"
     # None = the default (R's labels_position %||% "in")
@@ -125,7 +130,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                 title=dict(text=main, x=0.5, xanchor="center",
                            y=0.98, yanchor="top",
                            font=dict(size=title_size,
-                                     color=to_hex(get_option(
+                                     color=as_plotly_color(get_option(
                                          "lab_color", "black")))),
                 margin=dict(t=round(title_size * 2.2),
                             r=25, b=30, l=25))
@@ -162,7 +167,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
 
         target_r = 0.35
         y_top = target_r * 1.20
-        seg_color = to_hex(style_opts["grid_color"])
+        seg_color = as_plotly_color(style_opts["grid_color"])
         hover = (f"{x_name}: %{{customdata.xcat}}"
                  f"<br>{y_name}: %{{hovertext}}"
                  f"<br>% of {x_name}: %{{customdata.pct_x:.1%}}"
@@ -213,7 +218,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                     size=diam_px.tolist(),
                     sizemode="diameter",
                     color=fill_rgba,
-                    line=dict(color=to_hex(border), width=1),
+                    line=dict(color=as_plotly_color(border), width=1),
                     sizemin=12,
                 ),
                 text=label_show,
@@ -260,8 +265,8 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                         b=8, l=20, r=20),
             showlegend=False,
             template=None,
-            plot_bgcolor=to_hex(style_opts["panel_fill"]),
-            paper_bgcolor=to_hex(style_opts["window_fill"]),
+            plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+            paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
             **axes,
         )
         if main:
@@ -269,7 +274,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                 text=main, x=0.5, xanchor="center",
                 y=0.98, yanchor="top",
                 font=dict(size=title_size,
-                          color=to_hex(get_option("lab_color",
+                          color=as_plotly_color(get_option("lab_color",
                                                   "black")))))
         return fig
 
@@ -325,7 +330,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                 size=diam_px.tolist(),
                 sizemode="diameter",
                 color=fill_rgba,
-                line=dict(color=to_hex(border), width=1),
+                line=dict(color=as_plotly_color(border), width=1),
                 sizemin=12,
             ),
             text=label_show,
@@ -339,7 +344,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
         target_r = 0.35
         radius_data = (diam_px / max_diam) * target_r
         y_top = target_r * 1.20
-        seg_color = to_hex(style_opts["grid_color"])
+        seg_color = as_plotly_color(style_opts["grid_color"])
         stems = [dict(type="line", xref="x", yref="y",
                       x0=i, x1=i, y0=-1, y1=-float(radius_data[i]),
                       line=dict(color=seg_color, width=1),
@@ -363,8 +368,8 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                        range=[-1, y_top]),
             shapes=stems,
             template=None,
-            plot_bgcolor=to_hex(style_opts["panel_fill"]),
-            paper_bgcolor=to_hex(style_opts["window_fill"]),
+            plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+            paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
         )
         title_layout(fig)
         return fig
@@ -377,6 +382,11 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
 
     total = np.nansum(mat)
     share_tot = mat / total if total > 0 else np.zeros(mat.shape)
+    # values that are already proportions, each by group's distribution
+    #   over x, are their own percentages: a share of the table total
+    #   would divide them again by the number of groups
+    if shares:
+        share_tot = np.nan_to_num(mat)
     col_tot = np.nansum(mat, axis=0)
     with np.errstate(invalid="ignore", divide="ignore"):
         share_x = np.where(col_tot > 0, mat / col_tot, 0.0)
@@ -407,8 +417,14 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
         else:
             txt = _label_text(row, share_tot[i], labels, digits_d,
                               lbl_d)
-            label_show = [t if np.isfinite(dp) and dp >= label_min_px
-                          else "" for t, dp in zip(txt, diam_px)]
+            # a bubble labels its value when it is large enough to hold
+            #   it; label_min_value states that as a value instead, as
+            #   R's bubble plot frequency matrix does (power/2.5 * max)
+            label_show = ([t if np.isfinite(v) and v > label_min_value
+                           else "" for t, v in zip(txt, row)]
+                          if label_min_value is not None else
+                          [t if np.isfinite(dp) and dp >= label_min_px
+                           else "" for t, dp in zip(txt, diam_px)])
         customdata = [dict(xcat=c, bycat=g, pct_x=float(px),
                            pct_tot=float(pt))
                       for c, px, pt in zip(cats, share_x[i],
@@ -425,7 +441,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                 size=diam_px.tolist(),
                 sizemode="diameter",
                 color=grp_rgba[i],
-                line=dict(color=to_hex(border), width=1),
+                line=dict(color=as_plotly_color(border), width=1),
             ),
             text=label_show,
             textposition=txt_pos,
@@ -442,7 +458,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
             title=dict(text=x_lab if x_lab is not None else x_name,
                        font=dict(size=lab_font)),
             showgrid=True,
-            gridcolor=to_hex(style_opts["grid_color"]),
+            gridcolor=as_plotly_color(style_opts["grid_color"]),
             gridwidth=1,
             zeroline=False,
             tickfont=dict(size=tick_font),
@@ -460,11 +476,11 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
         template=None,
         shapes=[dict(type="rect", xref="paper", yref="paper",
                      x0=0, x1=1, y0=0, y1=1,
-                     line=dict(color=to_hex(
+                     line=dict(color=as_plotly_color(
                          style_opts["panel_border"]), width=1),
                      layer="below")],
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
     title_layout(fig)
     return fig

lessPy/corCFA.py

@@ -19,7 +19,7 @@ import re
 import numpy as np
 import pandas as pd
 
-from .utils import fmt, get_option
+from .utils import fmt, get_option, file_output, show_plots
 
 
 def _mimm(R, cuts, NItems, NF, Iter):
@@ -203,10 +203,10 @@ def corCFA(R, model=None, factors=None, min_cor=0.10,
     plots = {}
     if heat_map:
         plots["heatmap"] = _cfa_heatmap(Rout, items, fcols)
-    return corCFAResults(
+    return show_plots(corCFAResults(
         if_cor=if_cor, ff_cor=ff_cor, communalities=commun,
         alpha=alpha, omega=omega, pred=pred, resid=res,
-        plots=plots)
+        plots=plots))
 
 
 def _cfa_text(items, fcols, cuts, alpha, omega, iter, if_cor,
@@ -299,7 +299,7 @@ def _lavaan(fcols, cuts, items):
 
 def _cfa_heatmap(Rout, items, fcols):
     import plotly.graph_objects as go
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     labels = items + fcols
     style = plotly_style()
     fig = go.Figure(go.Heatmap(
@@ -308,9 +308,13 @@ def _cfa_heatmap(Rout, items, fcols):
         colorbar=dict(title="r")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text="Item / Factor Correlations", x=0.5,
                    xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corCFA = file_output(corCFA)

lessPy/corProp.py

@@ -11,7 +11,7 @@
 import numpy as np
 import pandas as pd
 
-from .utils import get_option
+from .utils import get_option, file_output, show_plots
 
 
 def corProp(R, main=None, heat_map=True):
@@ -48,13 +48,13 @@ def corProp(R, main=None, heat_map=True):
     if heat_map:
         plots["heatmap"] = _heatmap(out, main)
     out.attrs["plots"] = plots
-    return out
+    return show_plots(out)
 
 
 def _heatmap(df, main):
     import plotly.graph_objects as go
 
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     labels = list(df.columns)
     Z = df.to_numpy(dtype=float).copy()
     np.fill_diagonal(Z, np.nan)            # ignore the diagonal
@@ -65,9 +65,13 @@ def _heatmap(df, main):
         colorbar=dict(title="prop")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "Item Proportionalities", x=0.5,
                    xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corProp = file_output(corProp)

lessPy/corReflect.py

@@ -11,7 +11,7 @@
 import numpy as np
 import pandas as pd
 
-from .utils import get_option
+from .utils import get_option, file_output, show_plots
 
 
 def corReflect(R, vars, main=None, heat_map=True):
@@ -47,13 +47,13 @@ def corReflect(R, vars, main=None, heat_map=True):
     if heat_map:
         plots["heatmap"] = _heatmap(out, main)
     out.attrs["plots"] = plots
-    return out
+    return show_plots(out)
 
 
 def _heatmap(df, main):
     import plotly.graph_objects as go
 
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     labels = list(df.columns)
     Z = df.to_numpy(dtype=float).copy()
     np.fill_diagonal(Z, np.nan)
@@ -64,9 +64,13 @@ def _heatmap(df, main):
         colorbar=dict(title="r")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "With Reflected Item Coefficients",
                    x=0.5, xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corReflect = file_output(corReflect)

lessPy/corReorder.py

@@ -11,7 +11,7 @@
 import numpy as np
 import pandas as pd
 
-from .utils import get_option
+from .utils import get_option, file_output, show_plots
 
 # R hclust method -> scipy linkage method. scipy 'ward' is R's
 # ward.D2 (squared updates); ward.D has no scipy equivalent, so
@@ -70,7 +70,7 @@ def corReorder(R, order="hclust", hclust_type="complete",
             pass
     out.attrs["plots"] = plots
     out.attrs["order"] = label
-    return out
+    return show_plots(out)
 
 
 def _chain(S, nv, first):
@@ -130,7 +130,7 @@ def _apply_diag(M):
 
 def _heatmap(df, diagonal_new, main):
     import plotly.graph_objects as go
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     Z = df.to_numpy(dtype=float).copy()
     if diagonal_new:
         Z = _apply_diag(Z)
@@ -142,7 +142,7 @@ def _heatmap(df, diagonal_new, main):
         colorbar=dict(title="r")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "Reordered Correlations", x=0.5,
                    xanchor="center",
                    font=dict(size=round(
@@ -159,3 +159,7 @@ def _dendrogram(Z, names, label):
         title=dict(text="Cluster Dendrogram", x=0.5,
                    xanchor="center"))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corReorder = file_output(corReorder)

lessPy/corScree.py

@@ -9,9 +9,9 @@ import numpy as np
 import pandas as pd
 
 from .plotly_utils import (
-    axis_format, axis_num, plot_border, plotly_style, to_hex,
+    as_plotly_color, axis_format, axis_num, plot_border, plotly_style, to_hex,
     x_grid)
-from .utils import fmt, get_option, pretty
+from .utils import fmt, get_option, pretty, file_output, show_plots
 
 
 class corScreeResults:
@@ -54,8 +54,8 @@ def corScree(R, main=None):
         "differences": _scree_plot(
             ev_diff, "Differences of Successive Eigenvalues",
             main)}
-    return corScreeResults(eigenvalues=ev, differences=ev_diff,
-                           plots=plots)
+    return show_plots(corScreeResults(eigenvalues=ev, differences=ev_diff,
+                           plots=plots))
 
 
 def _scree_plot(y, y_lab, main):
@@ -64,7 +64,7 @@ def _scree_plot(y, y_lab, main):
     import plotly.graph_objects as go
     style = plotly_style()
     x = np.arange(1, len(y) + 1)
-    col = to_hex(get_option("fit_color", "#5C4032"))
+    col = as_plotly_color(get_option("fit_color", "#5C4032"))
     fig = go.Figure(go.Scatter(
         x=x, y=y, mode="lines+markers",
         line=dict(color=col, width=1.5),
@@ -74,14 +74,18 @@ def _scree_plot(y, y_lab, main):
     ax_x = axis_num("Index", list(x), [str(i) for i in x])
     ax_y = axis_num(y_lab, axT2, axis_format(axT2, 2))
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style["grid_col"]),
+                gridcolor=as_plotly_color(style["grid_col"]),
                 gridwidth=1, griddash="dot")
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y,
         shapes=x_grid(list(x)) + plot_border(), template=None,
-        plot_bgcolor=to_hex(style["panel_fill"]),
-        paper_bgcolor=to_hex(style["window_fill"]),
+        plot_bgcolor=as_plotly_color(style["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "", x=0.5, xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corScree = file_output(corScree)