From b3046c091bfc87f2ce36adb855a4921c9d3b3efa Mon Sep 17 00:00:00 2001
From: "Jose M. Palomar" <josem.palomar@energiaplus.es>
Date: Mon, 5 Feb 2024 18:33:59 +0100
Subject: [PATCH 1/3] Allow having stacked and overlapped category series

---
 .../main/java/org/knowm/xchart/CategorySeries.java    | 11 +++++++++++
 .../internal/chartpart/PlotContent_Category_Bar.java  |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/xchart/src/main/java/org/knowm/xchart/CategorySeries.java b/xchart/src/main/java/org/knowm/xchart/CategorySeries.java
index 0b767e8e1..d284e8ec9 100644
--- a/xchart/src/main/java/org/knowm/xchart/CategorySeries.java
+++ b/xchart/src/main/java/org/knowm/xchart/CategorySeries.java
@@ -9,6 +9,8 @@
 /** A Series containing category data to be plotted on a Chart */
 public class CategorySeries extends AxesChartSeriesCategory {
 
+  private boolean isOverlapped = false;
+
   private CategorySeriesRenderStyle chartCategorySeriesRenderStyle = null;
 
   /**
@@ -42,6 +44,15 @@ public CategorySeries setChartCategorySeriesRenderStyle(
     return this;
   }
 
+  public boolean isOverlapped() {
+    return isOverlapped;
+  }
+
+  public CategorySeries setOverlapped(boolean overlapped) {
+    isOverlapped = overlapped;
+    return this;
+  }
+
   @Override
   public LegendRenderType getLegendRenderType() {
 
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Bar.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Bar.java
index 97ab1120a..df101410e 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Bar.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Bar.java
@@ -174,7 +174,7 @@ public void doPaint(Graphics2D g) {
               } else {
                 yBottom = y;
               }
-              if (stylerCategory.isStacked()) {
+              if (stylerCategory.isStacked() && !series.isOverlapped()) {
                 yTop += accumulatedStackOffsetPos[categoryCounter];
                 yBottom += accumulatedStackOffsetPos[categoryCounter];
                 accumulatedStackOffsetPos[categoryCounter] += (yTop - yBottom);
@@ -190,7 +190,7 @@ public void doPaint(Graphics2D g) {
                 // yBottom.
               }
               yBottom = y;
-              if (stylerCategory.isStacked()) {
+              if (stylerCategory.isStacked() && !series.isOverlapped()) {
                 yTop -= accumulatedStackOffsetNeg[categoryCounter];
                 yBottom -= accumulatedStackOffsetNeg[categoryCounter];
                 accumulatedStackOffsetNeg[categoryCounter] += (yTop - yBottom);

From d9c96bd4158715fe857e93361c910d1848f2d96b Mon Sep 17 00:00:00 2001
From: "Jose M. Palomar" <josem.palomar@energiaplus.es>
Date: Wed, 7 Feb 2024 10:22:39 +0100
Subject: [PATCH 2/3] Add example for stacked bars with overlapped lines

---
 .../xchart/demo/charts/bar/BarChart12.java    | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java

diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java
new file mode 100644
index 000000000..0edef8e7c
--- /dev/null
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2024 Energía Plus. All rights reserved.
+ */
+
+package org.knowm.xchart.demo.charts.bar;
+
+import org.knowm.xchart.CategoryChart;
+import org.knowm.xchart.CategoryChartBuilder;
+import org.knowm.xchart.CategorySeries;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * Stacked Bars with Overlapped Line Chart
+ *
+ * <p>Demonstrates the following:
+ *
+ * <ul>
+ *   <li>bar series are stacked
+ *   <li>line series is overlapped
+ */
+public class BarChart12 implements ExampleChart<CategoryChart> {
+
+  public static void main(String[] args) {
+
+    ExampleChart<CategoryChart> exampleChart = new BarChart12();
+    CategoryChart chart = exampleChart.getChart();
+    new SwingWrapper<>(chart).displayChart();
+  }
+
+  private static List<Double> getRandomValues(int count) {
+
+    List<Double> values = new ArrayList<>(count);
+    Random rand = new Random();
+    for (int i = 0; i < count; i++) {
+      values.add(rand.nextDouble() * 1000);
+    }
+    return values;
+  }
+
+  @Override
+  public CategoryChart getChart() {
+
+    // Create Chart
+    CategoryChart chart =
+        new CategoryChartBuilder()
+            .width(800)
+            .height(600)
+            .title(getClass().getSimpleName())
+            .xAxisTitle("Quarter")
+            .yAxisTitle("Sales")
+            .build();
+
+    // Customize Chart
+    chart.getStyler().setPlotGridVerticalLinesVisible(false);
+    chart.getStyler().setLegendVisible(true);
+    chart.getStyler().setStacked(true);
+    chart
+        .getStyler()
+        .setSeriesColors(new Color[] {Color.RED, Color.ORANGE, Color.YELLOW, Color.DARK_GRAY});
+
+    List<Double> applesValues = getRandomValues(4);
+    List<Double> orangesValues = getRandomValues(4);
+    List<Double> lemonsValues = getRandomValues(4);
+    List<Double> averageValues = new ArrayList<>();
+    for (int i = 0; i < 4; i++) {
+      averageValues.add((applesValues.get(i) + orangesValues.get(i) + lemonsValues.get(i)) / 3);
+    }
+
+    // Series
+    CategorySeries staked1 =
+        chart.addSeries(
+            "Apples", Arrays.asList("1Q", "2Q", "3Q", "4Q"), applesValues);
+    CategorySeries staked2 =
+        chart.addSeries(
+            "Oranges", Arrays.asList("1Q", "2Q", "3Q", "4Q"), orangesValues);
+    CategorySeries staked3 =
+        chart.addSeries(
+            "Lemons", Arrays.asList("1Q", "2Q", "3Q", "4Q"), lemonsValues);
+    CategorySeries overlappedLine =
+        chart.addSeries(
+            "Average", Arrays.asList("1Q", "2Q", "3Q", "4Q"), averageValues);
+    overlappedLine.setOverlapped(true);
+    overlappedLine.setChartCategorySeriesRenderStyle(CategorySeries.CategorySeriesRenderStyle.Line);
+
+    return chart;
+  }
+
+  @Override
+  public String getExampleChartName() {
+
+    return getClass().getSimpleName() + " - Stacked Bars with Overlapped Line Chart";
+  }
+}

From 6afcf47f4971d86575d03da3d8984123d6e2a506 Mon Sep 17 00:00:00 2001
From: "Jose M. Palomar" <josem.palomar@energiaplus.es>
Date: Wed, 7 Feb 2024 10:33:33 +0100
Subject: [PATCH 3/3] Update example for stacked bars with overlapped lines

---
 .../xchart/demo/charts/bar/BarChart12.java    | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java
index 0edef8e7c..a09846fa3 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java
@@ -34,6 +34,11 @@ public static void main(String[] args) {
     new SwingWrapper<>(chart).displayChart();
   }
 
+  private static List<String> getMonths() {
+    return Arrays.asList(
+        "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
+  }
+
   private static List<Double> getRandomValues(int count) {
 
     List<Double> values = new ArrayList<>(count);
@@ -53,8 +58,8 @@ public CategoryChart getChart() {
             .width(800)
             .height(600)
             .title(getClass().getSimpleName())
-            .xAxisTitle("Quarter")
-            .yAxisTitle("Sales")
+            .xAxisTitle("Month")
+            .yAxisTitle("Consumption")
             .build();
 
     // Customize Chart
@@ -63,29 +68,28 @@ public CategoryChart getChart() {
     chart.getStyler().setStacked(true);
     chart
         .getStyler()
-        .setSeriesColors(new Color[] {Color.RED, Color.ORANGE, Color.YELLOW, Color.DARK_GRAY});
-
-    List<Double> applesValues = getRandomValues(4);
-    List<Double> orangesValues = getRandomValues(4);
-    List<Double> lemonsValues = getRandomValues(4);
+        .setSeriesColors(
+            new Color[] {
+              Color.decode("#2133D0"),
+              Color.decode("#FF3B47"),
+              Color.decode("#FFBD00"),
+              Color.DARK_GRAY
+            });
+
+    List<String> months = getMonths();
+    List<Double> period1Values = getRandomValues(12);
+    List<Double> period2Values = getRandomValues(12);
+    List<Double> period3Values = getRandomValues(12);
     List<Double> averageValues = new ArrayList<>();
-    for (int i = 0; i < 4; i++) {
-      averageValues.add((applesValues.get(i) + orangesValues.get(i) + lemonsValues.get(i)) / 3);
+    for (int i = 0; i < 12; i++) {
+      averageValues.add((period1Values.get(i) + period2Values.get(i) + period3Values.get(i)) / 3);
     }
 
     // Series
-    CategorySeries staked1 =
-        chart.addSeries(
-            "Apples", Arrays.asList("1Q", "2Q", "3Q", "4Q"), applesValues);
-    CategorySeries staked2 =
-        chart.addSeries(
-            "Oranges", Arrays.asList("1Q", "2Q", "3Q", "4Q"), orangesValues);
-    CategorySeries staked3 =
-        chart.addSeries(
-            "Lemons", Arrays.asList("1Q", "2Q", "3Q", "4Q"), lemonsValues);
-    CategorySeries overlappedLine =
-        chart.addSeries(
-            "Average", Arrays.asList("1Q", "2Q", "3Q", "4Q"), averageValues);
+    CategorySeries staked1 = chart.addSeries("Period 1", months, period1Values);
+    CategorySeries staked2 = chart.addSeries("Period 2", months, period2Values);
+    CategorySeries staked3 = chart.addSeries("Period 3", months, period3Values);
+    CategorySeries overlappedLine = chart.addSeries("Average", months, averageValues);
     overlappedLine.setOverlapped(true);
     overlappedLine.setChartCategorySeriesRenderStyle(CategorySeries.CategorySeriesRenderStyle.Line);