Mb/bar plot fix (#140)

Author: m-bossart

ext/plot_recipes.jl

@@ -79,6 +79,12 @@ function PowerGraphics._dataframe_plots_internal(
         plot.axis.title = title
     end
 
+    # For stacked bar plots CairoMakie's auto-legend extraction fails because a
+    # single barplot! object with a vector `color` attribute has no per-element
+    # color→label mapping. We capture the entries here and build the legend
+    # manually with PolyElement below.
+    bar_legend_entries = nothing
+
     if bar
         plot_data = sum(data; dims = 1) ./ interval
 
@@ -90,14 +96,16 @@ function PowerGraphics._dataframe_plots_internal(
             n = length(labels)
             xs = fill(1, n)
             heights = vec(plot_data)
+            bar_colors = collect(seriescolor[1:n])
             CairoMakie.barplot!(
                 plot.axis,
                 xs,
                 heights;
                 stack = collect(1:n),
-                color = collect(seriescolor[1:n]),
+                color = bar_colors,
                 label = string.(labels),
             )
+            bar_legend_entries = (string.(labels), bar_colors)
 
             plot.axis.xticks = ([1], [""])
         else
@@ -259,16 +267,41 @@ function PowerGraphics._dataframe_plots_internal(
         end
 
         if legend_position == :bottom
-            CairoMakie.Legend(
-                plot.figure[2, 1],
-                plot.axis;
-                orientation = :horizontal,
-                tellwidth = false,
-                tellheight = true,
-                legend_kwargs...,
-            )
+            if !isnothing(bar_legend_entries)
+                bar_labels, bar_colors = bar_legend_entries
+                elems = [CairoMakie.PolyElement(; color = c) for c in bar_colors]
+                CairoMakie.Legend(
+                    plot.figure[2, 1],
+                    elems,
+                    bar_labels;
+                    orientation = :horizontal,
+                    tellwidth = false,
+                    tellheight = true,
+                    legend_kwargs...,
+                )
+            else
+                CairoMakie.Legend(
+                    plot.figure[2, 1],
+                    plot.axis;
+                    orientation = :horizontal,
+                    tellwidth = false,
+                    tellheight = true,
+                    legend_kwargs...,
+                )
+            end
         else
-            CairoMakie.Legend(plot.figure[1, 2], plot.axis; legend_kwargs...)
+            if !isnothing(bar_legend_entries)
+                bar_labels, bar_colors = bar_legend_entries
+                elems = [CairoMakie.PolyElement(; color = c) for c in bar_colors]
+                CairoMakie.Legend(
+                    plot.figure[1, 2],
+                    elems,
+                    bar_labels;
+                    legend_kwargs...,
+                )
+            else
+                CairoMakie.Legend(plot.figure[1, 2], plot.axis; legend_kwargs...)
+            end
         end
         plot.has_legend = true
     end

src/call_plots.jl

@@ -752,19 +752,6 @@ function _plot_fuel!(p, result::IS.Results, backend; kwargs...)
     kwargs[:filter_func] = filter_func
 
     if load
-        # Net-load line = demand + storage charging, so it coincides with the
-        # top of the generation stack (charging is drawn as a negative band by
-        # the sign-aware stacker; only curtailment sits above the line).
-        charge = nothing
-        charge_cols = [k for k in keys(fuel) if endswith(k, " In")]
-        if !isempty(charge_cols)
-            nrows = length(gen.time)
-            charge = zeros(nrows)
-            for k in charge_cols
-                m = Matrix(PA.no_datetime(fuel[k]))   # negative (charging)
-                charge .+= -vec(sum(m; dims = 2))     # -> positive load
-            end
-        end
         p = _plot_demand!(
             p,
             result,
@@ -776,7 +763,6 @@ function _plot_fuel!(p, result::IS.Results, backend; kwargs...)
             set_display = false,
             stack = stack,
             seriescolor = ["black"],
-            extra_load = charge,
             kwargs...,
         )
     end

test/test_plot_creation.jl

@@ -243,8 +243,12 @@ function test_plots(file_path::String; backend_pkg::String = "cairomakie")
             nofill = true,
         )
 
+        # Use a freshly-built system rather than results_uc.system: PSI no longer
+        # serializes load time series with simulation results, so the system
+        # attached to simulation results lacks the forecasts that get_load_data needs.
+        sys_with_ts = PSB.build_system(PSB.PSISystems, "5_bus_hydro_uc_sys")
         p = plot_demand_fn(
-            results_uc.system;
+            sys_with_ts;
             set_display = set_display,
             title = "sysdemand",
             save = out_path,
@@ -254,7 +258,7 @@ function test_plots(file_path::String; backend_pkg::String = "cairomakie")
         @test plot_length == 1
 
         p = plot_demand_fn(
-            results_uc.system;
+            sys_with_ts;
             set_display = set_display,
             title = "sysdemand_bus",
             save = out_path,