Overlapping bar series (#1265) (#1627)

VisualMelon · web-flow · commit 1baea3b58c06 · 2020-08-05T15:29:59.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
 - Examples of full plot area polar plots with non-zero minimums (#1586)
 - Read-Only collection interfaces for .NET 4.0 (#1600)
 - Add PlotModel.AssignColorsToInvisibleSeries property to control whether invisible series are included or skipped when assigning automatic colors (#1599)
+- Overlapping bar series (#1265)
 
 ### Changed
 - Legends model (#644)
diff --git a/Source/Examples/ExampleLibrary/Series/BarSeriesExamples.cs b/Source/Examples/ExampleLibrary/Series/BarSeriesExamples.cs
@@ -909,6 +909,29 @@ public static PlotModel BaseValueStacked()
             return model;
         }
 
+        [Example("BaseValue (overlaping)")]
+        public static PlotModel BaseValueOverlaping()
+        {
+            var model = new PlotModel { Title = "BaseValue (overlaping)", Subtitle = "BaseValue = -1" };
+            var series1 = new BarSeries { Title = "Series 1", IsStacked = true, OverlapsStack = true, BaseValue = -1 };
+            series1.Items.Add(new BarItem { Value = 1 });
+            series1.Items.Add(new BarItem { Value = 2 });
+            model.Series.Add(series1);
+            var series2 = new BarSeries { Title = "Series 2", IsStacked = true, OverlapsStack = true, BaseValue = -1, BarWidth = 0.5 };
+            series2.Items.Add(new BarItem { Value = 4 });
+            series2.Items.Add(new BarItem { Value = 7 });
+            model.Series.Add(series2);
+
+            var categoryAxis = new CategoryAxis
+            {
+                Title = "Category",
+                Position = AxisPosition.Left
+            };
+            categoryAxis.Labels.AddRange(new[] { "A", "B" });
+            model.Axes.Add(categoryAxis);
+            return model;
+        }
+
         [Example("GapWidth 0%")]
         public static PlotModel GapWidth0()
         {
@@ -1015,12 +1038,18 @@ public static PlotModel AllInOne()
             s6.Items.Add(new BarItem { Value = 68 });
             s6.Items.Add(new BarItem { Value = 12 });
 
+            var s7 = new BarSeries { Title = "Series 7", IsStacked = true, OverlapsStack = true, StrokeColor = OxyColors.Black, StrokeThickness = 1, LabelFormatString = "{0:0}", LabelPlacement = LabelPlacement.Base, StackGroup = "3", BarWidth = 0.5 };
+            s7.Items.Add(new BarItem { Value = 10 });
+            s7.Items.Add(new BarItem { Value = 80 });
+            s7.Items.Add(new BarItem { Value = 100, CategoryIndex = categoryD });
+
             model.Series.Add(s1);
             model.Series.Add(s2);
             model.Series.Add(s3);
             model.Series.Add(s4);
             model.Series.Add(s5);
             model.Series.Add(s6);
+            model.Series.Add(s7);
             model.Axes.Add(categoryAxis);
             model.Axes.Add(valueAxis);
             return model;
diff --git a/Source/OxyPlot/Series/BarSeries/BarSeries.cs b/Source/OxyPlot/Series/BarSeries/BarSeries.cs
@@ -67,6 +67,9 @@ public BarSeries()
         /// <inheritdoc/>
         public bool IsStacked { get; set; }
 
+        /// <inheritdoc/>
+        public bool OverlapsStack { get; set; }
+
         /// <summary>
         /// Gets or sets the label format string.
         /// </summary>
@@ -198,7 +201,7 @@ protected internal override void UpdateMaxMin()
                     this.Manager.SetCurrentMinValue(stackIndex, i, minTemp);
 
                     var stackedMaxValue = this.Manager.GetCurrentMaxValue(stackIndex, i);
-                    if (!double.IsNaN(stackedMaxValue))
+                    if (!this.OverlapsStack && !double.IsNaN(stackedMaxValue))
                     {
                         maxTemp += stackedMaxValue;
                     }
@@ -380,7 +383,7 @@ public override void Render(IRenderContext rc)
 
                 // Get base- and topValue
                 var baseValue = double.NaN;
-                if (this.IsStacked)
+                if (this.IsStacked && !this.OverlapsStack)
                 {
                     baseValue = this.Manager.GetCurrentBaseValue(stackIndex, categoryIndex, value < 0);
                 }
diff --git a/Source/OxyPlot/Series/BarSeries/ErrorBarSeries.cs b/Source/OxyPlot/Series/BarSeries/ErrorBarSeries.cs
@@ -82,7 +82,7 @@ protected internal override void UpdateMaxMin()
                     this.Manager.SetCurrentMinValue(stackIndex, i, minTemp);
 
                     var stackedMaxValue = this.Manager.GetCurrentMaxValue(stackIndex, i);
-                    if (!double.IsNaN(stackedMaxValue))
+                    if (!this.OverlapsStack && !double.IsNaN(stackedMaxValue))
                     {
                         maxTemp += stackedMaxValue;
                     }
diff --git a/Source/OxyPlot/Series/BarSeries/IStackableSeries.cs b/Source/OxyPlot/Series/BarSeries/IStackableSeries.cs
@@ -19,6 +19,11 @@ public interface IStackableSeries : IBarSeries
         /// </summary>
         bool IsStacked { get; }
 
+        /// <summary>
+        /// Gets a value indicating whether this series should overlap its stack when <see cref="IsStacked"/> is true.
+        /// </summary>
+        bool OverlapsStack { get; }
+
         /// <summary>
         /// Gets the stack group.
         /// </summary>
diff --git a/Source/OxyPlot/Series/BarSeries/IntervalBarSeries.cs b/Source/OxyPlot/Series/BarSeries/IntervalBarSeries.cs
@@ -67,6 +67,9 @@ public IntervalBarSeries()
         /// <inheritdoc/>
         public bool IsStacked => true;
 
+        /// <inheritdoc/>
+        public bool OverlapsStack => true;
+
         /// <summary>
         /// Gets or sets the label color.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,9 @@ public BarSeries()`
`67`	`67`	`/// <inheritdoc/>`
`68`	`68`	`public bool IsStacked { get; set; }`
`69`	`69`
	`70`	`+ /// <inheritdoc/>`
	`71`	`+ public bool OverlapsStack { get; set; }`
	`72`	`+`
`70`	`73`	`/// <summary>`
`71`	`74`	`/// Gets or sets the label format string.`
`72`	`75`	`/// </summary>`
`@@ -198,7 +201,7 @@ protected internal override void UpdateMaxMin()`
`198`	`201`	`this.Manager.SetCurrentMinValue(stackIndex, i, minTemp);`
`199`	`202`
`200`	`203`	`var stackedMaxValue = this.Manager.GetCurrentMaxValue(stackIndex, i);`
`201`		`- if (!double.IsNaN(stackedMaxValue))`
	`204`	`+ if (!this.OverlapsStack && !double.IsNaN(stackedMaxValue))`
`202`	`205`	`{`
`203`	`206`	`maxTemp += stackedMaxValue;`
`204`	`207`	`}`
`@@ -380,7 +383,7 @@ public override void Render(IRenderContext rc)`
`380`	`383`
`381`	`384`	`// Get base- and topValue`
`382`	`385`	`var baseValue = double.NaN;`
`383`		`- if (this.IsStacked)`
	`386`	`+ if (this.IsStacked && !this.OverlapsStack)`
`384`	`387`	`{`
`385`	`388`	`baseValue = this.Manager.GetCurrentBaseValue(stackIndex, categoryIndex, value < 0);`
`386`	`389`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ protected internal override void UpdateMaxMin()`
`82`	`82`	`this.Manager.SetCurrentMinValue(stackIndex, i, minTemp);`
`83`	`83`
`84`	`84`	`var stackedMaxValue = this.Manager.GetCurrentMaxValue(stackIndex, i);`
`85`		`- if (!double.IsNaN(stackedMaxValue))`
	`85`	`+ if (!this.OverlapsStack && !double.IsNaN(stackedMaxValue))`
`86`	`86`	`{`
`87`	`87`	`maxTemp += stackedMaxValue;`
`88`	`88`	`}`