apmtools 0.2.6__tar.gz → 0.2.7__tar.gz

{apmtools-0.2.6 → apmtools-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: apmtools
-Version: 0.2.006
+Version: 0.2.007
 Summary: A collection of tools for processing air pollution monitoring data
 Project-URL: Homepage, https://github.com/federlorenz/apmtools
 Author-email: Federico Lorenzetti <lorenzetti.federico@gmail.com>

{apmtools-0.2.6 → apmtools-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apmtools"
-version = "0.2.006"
+version = "0.2.007"
 authors = [
   { name="Federico Lorenzetti", email="lorenzetti.federico@gmail.com" },
 ]

{apmtools-0.2.6 → apmtools-0.2.7}/src/apmtools/shiny/summary.py

@@ -351,12 +351,43 @@ def create_summary_app(
                 )
 
             if selected_plot == "histogram":
-                long_df = plot_df[y_columns].melt(
-                    var_name="variable", value_name="value")
-                fig = px.histogram(
-                    long_df, x="value", color="variable", nbins=int(input.bins()),
-                    barmode="overlay" if len(y_columns) > 1 else "relative",
-                )
+                if group_columns:
+                    # With grouping, overlay one histogram per group on the
+                    # same axes.  ``group`` is the color dimension rather
+                    # than the selected variable, so each group gets its own
+                    # histogram.  Transparency makes overlapping groups
+                    # directly comparable.
+                    group_column = "__plot_group"
+                    long_df = plot_df[[group_column, *y_columns]].melt(
+                        id_vars=[group_column],
+                        var_name="variable",
+                        value_name="value",
+                    )
+                    fig = px.histogram(
+                        long_df,
+                        x="value",
+                        color=group_column,
+                        nbins=int(input.bins()),
+                        barmode="overlay",
+                        opacity=0.45,
+                        facet_row=("variable" if len(y_columns) > 1 else None),
+                    )
+                    # Keep the groups as the legend entries rather than the
+                    # selected Y variables.
+                    fig.update_traces(marker_line_width=0)
+                else:
+                    long_df = plot_df[y_columns].melt(
+                        var_name="variable", value_name="value"
+                    )
+                    fig = px.histogram(
+                        long_df,
+                        x="value",
+                        color="variable",
+                        nbins=int(input.bins()),
+                        barmode="overlay" if len(
+                            y_columns) > 1 else "relative",
+                        opacity=0.65 if len(y_columns) > 1 else 1.0,
+                    )
             elif selected_plot == "box":
                 if not group_columns:
                     long_df = plot_df[y_columns].melt(