fixes #56

beto-rodriguez · Jun 24, 2021 · 7728230 · 7728230
1 parent a4eec71
commit 7728230
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 1 deletion.
diff --git a/src/LiveChartsCore/ColumnSeries.cs b/src/LiveChartsCore/ColumnSeries.cs
@@ -355,6 +355,12 @@ protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, S
 
             if (dataProvider == null) throw new Exception("Data provider not found");
             dataProvider.DisposePoint(point);
+
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
         }
     }
 }
diff --git a/src/LiveChartsCore/FinancialSeries.cs b/src/LiveChartsCore/FinancialSeries.cs
@@ -371,6 +371,40 @@ protected override void SetDefaultPointTransitions(ChartPoint chartPoint)
                         .WithEasingFunction(EasingFunction ?? chart.EasingFunction));
         }
 
+        /// <inheritdoc cref="Series{TModel, TVisual, TLabel, TDrawingContext}.SoftDeletePoint(ChartPoint, Scaler, Scaler)"/>
+        protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, Scaler secondaryScale)
+        {
+            var visual = (TVisual?)point.Context.Visual;
+            if (visual == null) return;
+
+            var chartView = (ICartesianChartView<TDrawingContext>)point.Context.Chart;
+            if (chartView.Core.IsZoomingOrPanning)
+            {
+                visual.CompleteAllTransitions();
+                visual.RemoveOnCompleted = true;
+                return;
+            }
+
+            var p = primaryScale.ToPixels(pivot);
+            var secondary = secondaryScale.ToPixels(point.SecondaryValue);
+
+            visual.X = secondary;
+            visual.Y = p;
+            visual.Open = p;
+            visual.Close = p;
+            visual.Low = p;
+            visual.RemoveOnCompleted = true;
+
+            if (dataProvider == null) throw new Exception("Data provider not found");
+            dataProvider.DisposePoint(point);
+
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
+        }
+
         /// <summary>
         /// Gets the paint tasks.
         /// </summary>

diff --git a/src/LiveChartsCore/HeatSeries.cs b/src/LiveChartsCore/HeatSeries.cs
@@ -326,6 +326,12 @@ protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, S
 
             if (dataProvider == null) throw new Exception("Data provider not found");
             dataProvider.DisposePoint(point);
+
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
         }
 
         /// <summary>

diff --git a/src/LiveChartsCore/LineSeries.cs b/src/LiveChartsCore/LineSeries.cs
@@ -743,6 +743,12 @@ protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, S
 
             if (dataProvider == null) throw new Exception("Data provider not found");
             dataProvider.DisposePoint(point);
+
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
         }
 
         /// <inheritdoc cref="Series{TModel, TVisual, TLabel, TDrawingContext}.SoftDelete(IChartView)"/>

diff --git a/src/LiveChartsCore/PieSeries.cs b/src/LiveChartsCore/PieSeries.cs
@@ -554,6 +554,12 @@ protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, S
 
             if (dataProvider == null) throw new Exception("Data provider not found");
             dataProvider.DisposePoint(point);
+
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
         }
 
         /// <summary>

diff --git a/src/LiveChartsCore/ScatterSeries.cs b/src/LiveChartsCore/ScatterSeries.cs
@@ -332,6 +332,12 @@ protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, S
 
             if (dataProvider == null) throw new Exception("Data provider not found");
             dataProvider.DisposePoint(point);
+
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
         }
     }
 }
diff --git a/src/LiveChartsCore/Series.cs b/src/LiveChartsCore/Series.cs
@@ -339,7 +339,7 @@ public string GetDataLabelText(ChartPoint point)
         /// <param name="primaryScale">The primary scale.</param>
         /// <param name="secondaryScale">The secondary scale.</param>
         /// <returns></returns>
-        protected virtual void SoftDeletePoint(ChartPoint point, Scaler primaryScale, Scaler secondaryScale) { }
+        protected abstract void SoftDeletePoint(ChartPoint point, Scaler primaryScale, Scaler secondaryScale);
 
         /// <summary>
         /// Called when a point was measured.

diff --git a/src/LiveChartsCore/StackedColumnSeries.cs b/src/LiveChartsCore/StackedColumnSeries.cs
@@ -326,6 +326,11 @@ protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, S
 
             if (dataProvider == null) throw new Exception("Data provider not found");
             dataProvider.DisposePoint(point);
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
         }
     }
 }
diff --git a/src/LiveChartsCore/StackedRowSeries.cs b/src/LiveChartsCore/StackedRowSeries.cs
@@ -336,6 +336,12 @@ protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, S
 
             if (dataProvider == null) throw new Exception("Data provider not found");
             dataProvider.DisposePoint(point);
+
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
         }
     }
 }
diff --git a/src/LiveChartsCore/StepLineSeries.cs b/src/LiveChartsCore/StepLineSeries.cs
@@ -689,6 +689,12 @@ protected override void SoftDeletePoint(ChartPoint point, Scaler primaryScale, S
 
             if (dataProvider == null) throw new Exception("Data provider not found");
             dataProvider.DisposePoint(point);
+
+            var label = (TLabel?)point.Context.Label;
+            if (label == null) return;
+
+            label.TextSize = 1;
+            label.RemoveOnCompleted = true;
         }
 
         /// <inheritdoc cref="Series{TModel, TVisual, TLabel, TDrawingContext}.SoftDelete(IChartView)"/>