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

lessPy/pivot.py

@@ -45,8 +45,10 @@ def pivot(data, compute, variable=None, by=None, filter=None,
     """Aggregate a numeric variable over by groups, or tabulate
     frequencies. compute is a statistic name or a list of names
     ("mean", ["mean","sd"], "table"); variable is the numeric
-    column to aggregate; by is the grouping column(s). Returns a
-    long-form DataFrame. R analog: pivot()"""
+    column to aggregate, or a list of them, each then with its own
+    {variable}_n, {variable}_na, and statistic columns; by is the
+    grouping column(s). Returns a long-form DataFrame.
+    R analog: pivot()"""
     if filter is not None:
         data = data.query(filter)
     computes = [compute] if isinstance(compute, str) \
@@ -72,16 +74,44 @@ def pivot(data, compute, variable=None, by=None, filter=None,
         raise ValueError(
             f"unknown compute {unknown}; use "
             f"{', '.join(_STAT)}, or \"table\"")
-    v = get_column(data, variable, "variable")
-    if not pd.api.types.is_numeric_dtype(v):
-        raise TypeError(
-            f"the variable to aggregate '{variable}' is "
-            f"{v.dtype}: it must be numeric. Put categorical "
-            "variables in by=.")
+    variables = (list(variable) if isinstance(variable, (list, tuple))
+                 else [variable])
+    for var in variables:
+        v = get_column(data, var, "variable")
+        if not pd.api.types.is_numeric_dtype(v):
+            raise TypeError(
+                f"the variable to aggregate '{var}' is "
+                f"{v.dtype}: it must be numeric. Put categorical "
+                "variables in by=.")
     if not by:
         raise ValueError("by= is required: the grouping "
                          "column(s)")
-    return _pivot_agg(data, variable, by, computes, show_n, sort)
+    if len(variables) == 1:
+        return _pivot_agg(data, variables[0], by, computes, show_n,
+                          sort)
+    if len(computes) > 1:              # R pivot.R
+        raise ValueError(
+            "Cannot have multiple compute functions, multiple "
+            "variables,\n  and do aggregation with a by variable. "
+            "Choose two of the three")
+    # several variables: each its own n, na, and statistic, side by
+    #   side over the same by groups, as R's Sales_n, Sales_na,
+    #   Sales_sum, Profit_n, ...
+    parts = []
+    for var in variables:
+        a = _pivot_agg(data, var, by, computes, True, None)
+        parts.append(a.drop(columns=by).rename(
+            columns={"n": f"{var}_n", "na": f"{var}_na"}))
+    out = pd.concat([a[by]] + parts, axis=1)
+    if sort is not None:
+        stat_col = out.columns[-1]
+        out = out.sort_values(
+            stat_col, ascending=(sort == "+"),
+            na_position="last", kind="stable").reset_index(drop=True)
+    if not show_n:
+        out = out.drop(columns=[c for v_ in variables
+                                for c in (f"{v_}_n", f"{v_}_na")])
+    return out
 
 
 def _cat_frame(data, by):

lessPy/plotly_utils.py

@@ -264,14 +264,14 @@ def legend_style(by_name, style_opts, title=None, position=None,
         title=dict(text=abbrev(text, abbrev_n) or "",
                    font=dict(size=round(
                        15 * get_option("lab_size", 1) * mult),
-                       color=to_hex(style_opts["lab_color"]))),
+                       color=as_plotly_color(style_opts["lab_color"]))),
         # the legend reads in the theme's label color, light on the
         #   black sub_theme as the axis labels are
         font=dict(size=round(
             16 * get_option("axis_size", 0.9) * mult),
-            color=to_hex(style_opts["lab_color"])),
-        bgcolor=to_hex(style_opts["window_fill"]),
-        bordercolor=to_hex(style_opts["legend_border"]),
+            color=as_plotly_color(style_opts["lab_color"])),
+        bgcolor=as_plotly_color(style_opts["window_fill"]),
+        bordercolor=as_plotly_color(style_opts["legend_border"]),
         borderwidth=1,
     )
     # placement stays plotly's own unless asked for, so the callers
@@ -360,6 +360,17 @@ def axis_format(vals, digits_d=2, axis_fmt="K", prefix=""):
     return base
 
 
+_R_DASH = {"dashed": "dash", "dotted": "dot",
+           "dotdash": "dashdot", "longdash": "longdash",
+           "twodash": "longdashdot"}
+
+
+def r_dash(lty):
+    """An R line type name as plotly's dash, such as "dotted" to
+    "dot"; plotly's own names and None pass through. R analog: lty"""
+    return _R_DASH.get(lty, lty) if isinstance(lty, str) else lty
+
+
 def grid_style():
     """R analog: .grid_style(). A sub_theme sets the grid through
     grid_x_color / grid_y_color (white on the gray panel of "default"),
@@ -367,9 +378,9 @@ def grid_style():
     clr = (get_option("grid_y_color") or get_option("grid_x_color")
            or get_option("grid_col", "gray85"))
     return {
-        "color": to_hex(clr),
+        "color": as_plotly_color(clr),
         "width": get_option("grid_lwd", 0.5),
-        "dash": get_option("grid_lty", None),
+        "dash": r_dash(get_option("grid_lty", None)),
     }
 
 
@@ -416,24 +427,24 @@ def axis_base():
     return {
         "zeroline": False,
         "showline": True,
-        "linecolor": to_hex(ax_line),
+        "linecolor": as_plotly_color(ax_line),
         "linewidth": get_option("axis_lwd", 1),
         "ticks": "outside",
         "ticklen": 4,
-        "tickcolor": to_hex(ax_line),
+        "tickcolor": as_plotly_color(ax_line),
         "automargin": True,
         "tickfont": {
-            "color": to_hex(ax_text),
+            "color": as_plotly_color(ax_text),
             "size": 16 * get_option("axis_size", 0.9),
         },
         "title": {
             "font": {
-                "color": to_hex(get_option("lab_color", "black")),
+                "color": as_plotly_color(get_option("lab_color", "black")),
                 "size": 15 * get_option("lab_size", 1),
             },
             "standoff": 10,
         },
-        "gridcolor": to_hex(get_option("grid_color", "gray90")),
+        "gridcolor": as_plotly_color(get_option("grid_color", "gray90")),
         "gridwidth": get_option("grid_lwd", 1),
     }
 
@@ -503,7 +514,7 @@ def add_subtitle(fig, sub):
     title_size = round(16 * get_option("main_size", 1))
     size = round(title_size * get_option("sub_size", 0.75) / 0.75
                  * 0.75)
-    color = to_hex(get_option("sub_color",
+    color = as_plotly_color(get_option("sub_color",
                               get_option("main_color",
                                          get_option("lab_color",
                                                     "black"))))
@@ -558,13 +569,66 @@ def font_scaled(func):
     return wrapper
 
 
-def sym_at(shape, i):
-    """Per-group marker symbol. A scalar shape is used for every
-    group (by= differentiates by color only, the default); a list/
-    tuple gives one symbol per group, recycled if short."""
+# R's pch codes 0-25 as plotly symbols; 21-25 are lessR's named
+# shapes. R analog: .plt.shapes(), and points() for the open codes
+_R_PCH = {
+    0: "square-open", 1: "circle-open", 2: "triangle-up-open",
+    3: "cross-thin-open", 4: "x-thin-open", 5: "diamond-open",
+    6: "triangle-down-open", 7: "square-x-open",
+    8: "asterisk-open", 9: "diamond-cross-open",
+    10: "circle-cross-open", 11: "hexagram-open",
+    12: "square-cross-open", 13: "circle-x-open",
+    14: "square-open", 15: "square", 16: "circle",
+    17: "triangle-up", 18: "diamond", 19: "circle", 20: "circle",
+    21: "circle", 22: "square", 23: "diamond", 24: "triangle-up",
+    25: "triangle-down"}
+_LESSR_SHAPES = {"triup": "triangle-up", "tridown": "triangle-down"}
+# pt_shape="vary": one shape per by group, in lessR's order
+_VARY = (["triup", "tridown", "circle", "square", "diamond",
+          8, 7, 9, 10, 12, 13, 14, 11]
+         + list("abcdefghijklmnopqrstuvwxyz")
+         + list("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
+         + list("+*#%!=-&$?|><@./;:"))
+
+
+def shape_at(shape, i):
+    """Per-group shape as (plotly symbol, None), or (None, char) for
+    a single character, drawn as text, as R's pch="$". A scalar
+    shape is used for every group (by= differentiates by color
+    only, the default); a list gives one shape per group, recycled;
+    "vary" a different shape per group. Takes plotly's names,
+    lessR's triup/tridown, and R's pch codes 0-25.
+    R analog: .plt.shapes()"""
+    if isinstance(shape, str) and shape == "vary":
+        shape = _VARY
     if isinstance(shape, (list, tuple)):
-        return shape[i % len(shape)]
-    return shape
+        shape = shape[i % len(shape)]
+    if isinstance(shape, (int, np.integer)) and not isinstance(
+            shape, bool):
+        if int(shape) not in _R_PCH:
+            raise ValueError(
+                f"pt_shape={shape}: R's numbered shapes are 0 to 25")
+        return _R_PCH[int(shape)], None
+    s = str(shape)
+    if len(s) == 1:
+        return None, s
+    return _LESSR_SHAPES.get(s, s), None
+
+
+def marks(shape, i, mode, marker):
+    """go.Scatter keywords that draw the points of group i: the
+    marker with its symbol, or for a character shape the
+    character as text in the marker's border color, sized to the
+    marker. mode is "markers" or "lines+markers"."""
+    sym, ch = shape_at(shape, i)
+    if ch is None:
+        return dict(mode=mode, marker=dict(marker, symbol=sym))
+    color = (marker.get("line") or {}).get("color", marker.get("color"))
+    return dict(mode=mode.replace("markers", "text"), text=ch,
+                textposition="middle center",
+                textfont=dict(color=color,
+                              size=max(8, round(float(np.median(
+                                  marker.get("size", 8))) * 1.4))))
 
 
 def square_layout(main=False, side=460):
@@ -693,8 +757,8 @@ def finish_facet(fig, levels, ax, x_lab, y_lab, gridT1,
     anns = list(fig.layout.annotations or [])
     s_fill = as_plotly_color(get_option("strip_fill",
                                         "#7F7F7F37"))
-    s_line = to_hex(get_option("strip_color", "gray40"))
-    s_text = to_hex(get_option("strip_text_color", "gray15"))
+    s_line = as_plotly_color(get_option("strip_color", "gray40"))
+    s_text = as_plotly_color(get_option("strip_text_color", "gray15"))
     strip_h = max(0.10, min(0.30, 0.05 * n_row))
     # strip font: shrink so the longest label fits its panel
     # (the two-facet  Var = "level"  cell labels run long)
@@ -716,7 +780,7 @@ def finish_facet(fig, levels, ax, x_lab, y_lab, gridT1,
         if y_cat is None:
             ay = axis_num(show_ylab, ax["axT2"], ax["axL2"])
             ay.update(showgrid=True,
-                      gridcolor=to_hex(style_opts["grid_col"]),
+                      gridcolor=as_plotly_color(style_opts["grid_col"]),
                       gridwidth=1, griddash="dot",
                       showticklabels=c == 1,
                       range=[0, float(ax["axT2"][-1]) * 1.04])
@@ -749,7 +813,7 @@ def finish_facet(fig, levels, ax, x_lab, y_lab, gridT1,
         else:
             fig.update_xaxes(
                 row=r, col=c, showline=True, ticks="",
-                linecolor=to_hex(get_option("axis_color",
+                linecolor=as_plotly_color(get_option("axis_color",
                                             "black")))
         for v in (gridT1 or []):          # vertical panel grid
             shapes.append({
@@ -762,7 +826,7 @@ def finish_facet(fig, levels, ax, x_lab, y_lab, gridT1,
             "type": "rect",
             "xref": f"x{suf} domain", "yref": f"y{suf} domain",
             "x0": 0, "x1": 1, "y0": 0, "y1": 1,
-            "line": {"color": to_hex("gray75"), "width": 1},
+            "line": {"color": as_plotly_color("gray75"), "width": 1},
             "fillcolor": "rgba(0,0,0,0)"})
         shapes.append({                   # strip label band
             "type": "rect",
@@ -787,8 +851,8 @@ def finish_facet(fig, levels, ax, x_lab, y_lab, gridT1,
 
     layout_kw = dict(
         shapes=shapes, annotations=anns, 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"]),
         height=height if height is not None else 140 + 160 * n_row,
     )
     if width is not None:
@@ -883,7 +947,7 @@ def plot_border(top=True, right=True, color=None, width=None):
     if isinstance(color, str) and re.fullmatch(r"gray\d+", color):
         color = "gray75"   # make a gray a little lighter for plotly
 
-    line = {"color": to_hex(color), "width": width}
+    line = {"color": as_plotly_color(color), "width": width}
     out = []
     if top:
         out.append({"type": "line", "xref": "paper", "yref": "paper",

lessPy/plt_add.py

@@ -13,14 +13,9 @@
 import numpy as np
 import plotly.graph_objects as go
 
-from .plotly_utils import as_plotly_color, make_trans, to_hex
+from .plotly_utils import as_plotly_color, make_trans, r_dash, to_hex
 from .utils import get_option
 
-_DASH = {"dashed": "dash", "dotted": "dot",
-         "dotdash": "dashdot", "longdash": "longdash",
-         "twodash": "longdashdot"}
-
-
 def _as_list(v):
     if v is None:
         return []
@@ -86,7 +81,7 @@ def plt_add(fig, add, x1=None, x2=None, y1=None, y2=None):
                   else as_plotly_color(fll))
         line = dict(color=col, width=max(0.5, lwd * 2))
         if lty != "solid":
-            line["dash"] = _DASH.get(lty, lty)
+            line["dash"] = r_dash(lty)
 
         for xx1, yy1, xx2, yy2 in locs(obj):
             if obj == "v_line":

lessPy/plt_contour.py

@@ -14,7 +14,7 @@ import plotly.graph_objects as go
 from scipy import stats as sps
 
 from .plotly_utils import (
-    axis_format, axis_num, get_tick_fmt, plot_border,
+    as_plotly_color, axis_format, axis_num, get_tick_fmt, plot_border,
     plotly_style, to_hex)
 from .utils import get_option, pretty
 
@@ -134,7 +134,7 @@ def plt_contour(xv, yv, contour_n, contour_nbins, contour_points,
         showscale=bool(legend),
         colorbar=dict(
             tickfont=dict(
-                color=to_hex(get_option("axis_color", "black")),
+                color=as_plotly_color(get_option("axis_color", "black")),
                 size=16 * get_option("axis_size", 0.9)),
             outlinewidth=0),
         hovertemplate=(f"{x_lab}: {xpart}<br>{y_lab}: {ypart}"
@@ -158,7 +158,7 @@ def plt_contour(xv, yv, contour_n, contour_nbins, contour_points,
     for ex_l, ey_l in ellipses or []:
         fig.add_trace(go.Scatter(
             x=ex_l, y=ey_l, mode="lines",
-            line=dict(color=to_hex(ellipse_color),
+            line=dict(color=as_plotly_color(ellipse_color),
                       width=ellipse_lwd),
             hoverinfo="skip", showlegend=False))
 
@@ -167,7 +167,7 @@ def plt_contour(xv, yv, contour_n, contour_nbins, contour_points,
             continue
         fig.add_trace(go.Scatter(
             x=fl["x"], y=fl["y"], mode="lines",
-            line=dict(color=to_hex(fit_color), width=fit_lwd),
+            line=dict(color=as_plotly_color(fit_color), width=fit_lwd),
             hoverinfo="skip", showlegend=False))
 
     ax_x = axis_num(x_lab, axT1, axL1)
@@ -178,8 +178,8 @@ def plt_contour(xv, yv, contour_n, contour_nbins, contour_points,
         xaxis=ax_x, yaxis=ax_y,
         shapes=plot_border(),
         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:

lessPy/plt_contour_facet.py

@@ -17,7 +17,7 @@ import numpy as np
 import plotly.graph_objects as go
 
 from .plotly_utils import (
-    axis_format, facet_fig, facet_panels, finish_facet,
+    as_plotly_color, axis_format, facet_fig, facet_panels, finish_facet,
     plotly_style, to_hex)
 from .plt_contour import _COLORSCALE, _bw_nrd, _kde2d
 from .plt_smooth import _RAMP as _SMOOTH_RAMP
@@ -159,7 +159,7 @@ def plt_contour_facet(xv, yv, facet_arr, facet_order, facet_name,
             ex, ey = ellipse_fn(xi, yi, float(lv))
             fig.add_trace(go.Scatter(
                 x=ex, y=ey, mode="lines",
-                line=dict(color=to_hex(ellipse_color),
+                line=dict(color=as_plotly_color(ellipse_color),
                           width=ellipse_lwd),
                 hoverinfo="skip", showlegend=False,
             ), row=row, col=col)
@@ -169,7 +169,7 @@ def plt_contour_facet(xv, yv, facet_arr, facet_order, facet_name,
             if okf.sum() >= 2:
                 fig.add_trace(go.Scatter(
                     x=xs[okf], y=f[okf], mode="lines",
-                    line=dict(color=to_hex(fit_color),
+                    line=dict(color=as_plotly_color(fit_color),
                               width=fit_lwd),
                     hoverinfo="skip", showlegend=False,
                 ), row=row, col=col)

lessPy/plt_mat_plotly.py

@@ -68,12 +68,12 @@ def scatter_matrix(df, fit="lm", digits_d=2, cor_coef=True,
     bg = window_fill if panel_fill == "transparent" else panel_fill
     diag_fill = get_option("se_fill", "#1A1A1A19")
     se_fill = get_option("se_fill", "#1A1A1A19")
-    border = to_hex(style["panel_border"])
+    border = as_plotly_color(style["panel_border"])
     pt_fill = get_option("pt_fill", get_option("pt_color",
                                                "#324E5C"))
     pt_color = get_option("pt_color", "#324E5C")
-    lab_color = to_hex(style["lab_color"])
-    fit_color = to_hex(get_option("fit_color", "#5C4032"))
+    lab_color = as_plotly_color(style["lab_color"])
+    fit_color = as_plotly_color(get_option("fit_color", "#5C4032"))
     fit_lwd = get_option("fit_lwd", 2)
 
     # sizes shrink with the variable count, as R's cex.adj
@@ -160,8 +160,8 @@ def scatter_matrix(df, fit="lm", digits_d=2, cor_coef=True,
 
     fig.update_layout(
         template=None, showlegend=False,
-        plot_bgcolor=to_hex(bg),
-        paper_bgcolor=to_hex(window_fill))
+        plot_bgcolor=as_plotly_color(bg),
+        paper_bgcolor=as_plotly_color(window_fill))
     if main:
         fig.update_layout(title=dict(
             text=main, x=0.5, xanchor="center",
@@ -207,16 +207,17 @@ def _scatter_cell(fig, r, c, xv, yv, fit, do_fit, px,
                                         (f - tq * se_f)[::-1]]))
             else:
                 poly = _se_band(xs, ys_s, f, 0.95)
-            fig.add_trace(go.Scatter(
-                x=poly[0], y=poly[1], mode="none", fill="toself",
-                fillcolor=as_plotly_color(se_fill),
-                hoverinfo="skip", showlegend=False), row=r, col=c)
+            if poly is not None:
+                fig.add_trace(go.Scatter(
+                    x=poly[0], y=poly[1], mode="none", fill="toself",
+                    fillcolor=as_plotly_color(se_fill),
+                    hoverinfo="skip", showlegend=False), row=r, col=c)
 
     fig.add_trace(go.Scatter(
         x=xv, y=yv, mode="markers",
         marker=dict(symbol="circle", size=px, sizemode="diameter",
                     color=make_trans(pt_fill, 0.9), opacity=1,
-                    line=dict(color=to_hex(pt_color), width=0.5)),
+                    line=dict(color=as_plotly_color(pt_color), width=0.5)),
         hoverinfo="x+y", showlegend=False), row=r, col=c)
 
     if do_fit and len(xv) >= 2:

lessPy/plt_plotly.py

@@ -17,7 +17,7 @@ import plotly.graph_objects as go
 
 from .plotly_utils import (
     as_plotly_color, axis_base, axis_num, get_tick_fmt, make_trans,
-    plot_border, plotly_style, sym_at, to_hex, x_grid, y_grid,
+    plot_border, plotly_style, marks, to_hex, x_grid, y_grid,
 )
 from .utils import get_option
 
@@ -47,6 +47,7 @@ def plt_plotly(groups, by_name=None,
                se_polys=None, se_fill=None,
                ellipses=None, ellipse_fill=None,
                ellipse_color=None, ellipse_lwd=1,
+               sizes=None, size_name=None,
                style_opts=None):
     """Scatterplot / time-series renderer for XY().
 
@@ -107,19 +108,34 @@ def plt_plotly(groups, by_name=None,
             hover = hover.replace(
                 "<extra></extra>", f"<br>{by_name}: {nm}"
                                    "<extra></extra>")
+        # bubbles: a pixel diameter per point, its value in the hover
+        custom = None
+        if sizes is not None:
+            custom = sizes[i][1]
+            hover = hover.replace(
+                "<extra></extra>",
+                f"<br>{size_name}: %{{customdata:.{digits_d}f}}"
+                "<extra></extra>")
         marker = dict(
-            symbol=sym_at(shape, i), size=px, sizemode="diameter",
+            size=px if sizes is None else sizes[i][0],
+            sizemode="diameter",
             color=make_trans(fills[i], pt_opacity), opacity=1,
-            line=dict(color=to_hex(borders[i]), width=1),
-        ) if "markers" in mode_pts else None
+            line=dict(color=as_plotly_color(borders[i]), width=1),
+        )
+        pts_kw = (marks(shape, i, mode_pts, marker)
+                  if "markers" in mode_pts else dict(mode=mode_pts))
+        # a single series' line takes segment_color when it is given;
+        #   several series keep the color that distinguishes them
+        ln_col = (style_opts["segment_color"]
+                  if not has_groups and get_option("segment_color_set")
+                  else borders[i])
         fig.add_trace(go.Scatter(
-            x=xv, y=yv, mode=mode_pts,
+            x=xv, y=yv, **pts_kw,
             name=None if nm is None else str(nm),
             legendgroup=None if nm is None else str(nm),
-            marker=marker,
-            line=(dict(color=to_hex(borders[i]), width=ln_width)
+            line=(dict(color=as_plotly_color(ln_col), width=ln_width)
                   if connect else None),
-            hovertemplate=hover,
+            hovertemplate=hover, customdata=custom,
             # connected series show a legend-only line sample below
             showlegend=has_groups and not connect,
         ))
@@ -127,15 +143,15 @@ def plt_plotly(groups, by_name=None,
             fig.add_trace(go.Scatter(
                 x=xv[:2], y=yv[:2], mode="lines",
                 name=str(nm), legendgroup=str(nm),
-                line=dict(color=to_hex(borders[i]), width=ln_width),
+                line=dict(color=as_plotly_color(borders[i]), width=ln_width),
                 hoverinfo="skip", showlegend=True,
             ))
 
     # ellipses: border per group when grouped, else ellipse_color
     if ellipses:
         for k, (ex, ey) in enumerate(ellipses):
-            edge = (to_hex(borders[k]) if has_groups
-                    else to_hex(ellipse_color))
+            edge = (as_plotly_color(borders[k % n_grp]) if has_groups
+                    else as_plotly_color(ellipse_color))
             fig.add_trace(go.Scatter(
                 x=ex, y=ey, mode="lines",
                 line=dict(color=edge, width=ellipse_lwd),
@@ -171,8 +187,8 @@ def plt_plotly(groups, by_name=None,
                 name="Fit" if single else f"Fit: {nm}",
                 legendgroup="fit" if single else str(nm),
                 line=dict(
-                    color=(to_hex(fit_color) if single
-                           else to_hex(fills[i])),
+                    color=(as_plotly_color(fit_color) if single
+                           else as_plotly_color(fills[i])),
                     width=fit_lwd),
                 hovertemplate=(
                     f"{x_lab}: {xpart}<br>{lbl}: {ypart}"
@@ -185,7 +201,7 @@ def plt_plotly(groups, by_name=None,
         ax_x = axis_base()
         ax_x["title"]["text"] = x_lab
         ax_x.update(showgrid=True,
-                    gridcolor=to_hex(style_opts["grid_col"]),
+                    gridcolor=as_plotly_color(style_opts["grid_col"]),
                     gridwidth=1)
         shapes = y_grid(gridT2) + plot_border()
     else:
@@ -193,7 +209,7 @@ def plt_plotly(groups, by_name=None,
         shapes = x_grid(gridT1) + y_grid(gridT2) + plot_border()
     ax_y = axis_num(y_lab, ax["axT2"], ax["axL2"])
 
-    leg_color = to_hex(style_opts["lab_color"])
+    leg_color = as_plotly_color(style_opts["lab_color"])
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y,
         shapes=shapes,
@@ -209,12 +225,12 @@ def plt_plotly(groups, by_name=None,
                 family="Arial", color=leg_color),
             orientation="v", x=1.05, y=0.5,
             xanchor="left", yanchor="middle",
-            bgcolor=to_hex(style_opts["window_fill"]),
+            bgcolor=as_plotly_color(style_opts["window_fill"]),
             bordercolor="#CCCCCC", borderwidth=1,
             itemsizing="constant",
         ),
-        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:

lessPy/plt_smooth.py

@@ -129,7 +129,7 @@ def plt_smooth(xv, yv, smooth_points, smooth_size, smooth_power,
     for ex, ey in ellipses or []:
         fig.add_trace(go.Scatter(
             x=ex, y=ey, mode="lines",
-            line=dict(color=to_hex(ellipse_color),
+            line=dict(color=as_plotly_color(ellipse_color),
                       width=ellipse_lwd),
             fill="toself",
             fillcolor=as_plotly_color(ellipse_fill),
@@ -145,7 +145,7 @@ def plt_smooth(xv, yv, smooth_points, smooth_size, smooth_power,
         fig.add_trace(go.Scatter(
             x=fl["x"], y=fl["y"], mode="lines", name="Fit",
             legendgroup="fit",
-            line=dict(color=to_hex(fit_color), width=fit_lwd),
+            line=dict(color=as_plotly_color(fit_color), width=fit_lwd),
             hoverinfo="skip", showlegend=True))
 
     ax_x = axis_num(x_lab, ax["axT1"], ax["axL1"])
@@ -156,8 +156,8 @@ def plt_smooth(xv, yv, smooth_points, smooth_size, smooth_power,
         xaxis=ax_x, yaxis=ax_y,
         shapes=x_grid(gridT1) + y_grid(gridT2) + plot_border(),
         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:

lessPy/prob_norm.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 
-from .utils import fmt, show_plots
+from .utils import fmt, file_output, show_plots
 
 _FILL_NRM = "#E8E8E8"      # grey91
 _FILL_INT = "#9FB6CD"      # slategray3
@@ -109,3 +109,7 @@ def _plot(lo, hi, lo_lbl, hi_lbl, mu, sigma, prob, nrm_color,
                                showarrow=False,
                                font=dict(size=11))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+prob_norm = file_output(prob_norm)

lessPy/prob_tcut.py

@@ -9,7 +9,7 @@
 
 import numpy as np
 
-from .utils import fmt, show_plots
+from .utils import fmt, file_output, show_plots
 
 _BG = "#F9F9FC"             # rgb(249,249,252)
 _TAIL = "#8B475D"           # palevioletred4
@@ -129,3 +129,7 @@ def _plot(df, alpha, t_lo, t_hi, n_lo, n_hi, digits_d, y_axis,
                     bordercolor="black", borderwidth=0.5,
                     font=dict(size=10)))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+prob_tcut = file_output(prob_tcut)

lessPy/prob_znorm.py

@@ -11,7 +11,7 @@
 
 import numpy as np
 
-from .utils import show_plots
+from .utils import file_output, show_plots
 
 
 class ProbZnormResults:
@@ -110,3 +110,7 @@ def _plot(mu, sigma, border, fill, main, y_axis, z):
                                showarrow=False,
                                font=dict(size=11))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+prob_znorm = file_output(prob_znorm)