Merge pull request Live-Charts#495 from beto-rodriguez/develop

complement to Live-Charts#471
MikaelGyth · Mar 13, 2017 · b18ac38 · b18ac38
2 parents 4e60a22 + 12276fc
commit b18ac38
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 26 deletions.
diff --git a/UwpView/CandleSeries.cs b/UwpView/CandleSeries.cs
@@ -192,7 +192,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/ColumnSeries.cs b/UwpView/ColumnSeries.cs
@@ -190,7 +190,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/HeatSeries.cs b/UwpView/HeatSeries.cs
@@ -183,7 +183,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/LineSeries.cs b/UwpView/LineSeries.cs
@@ -301,7 +301,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/OhlcSeries.cs b/UwpView/OhlcSeries.cs
@@ -202,7 +202,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/PieSeries.cs b/UwpView/PieSeries.cs
@@ -158,7 +158,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (pbv.HoverShape != null) pbv.HoverShape.Visibility = Visibility;
 
-            if (DataLabels && pbv.DataLabel == null)
+            if (DataLabels)
             {
                 pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {

diff --git a/UwpView/RowSeries.cs b/UwpView/RowSeries.cs
@@ -192,7 +192,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/ScatterSeries.cs b/UwpView/ScatterSeries.cs
@@ -166,7 +166,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/Series.cs b/UwpView/Series.cs
@@ -388,7 +388,7 @@ public object Configuration
 
         #region Internal Helpers
 
-        internal ContentControl UpdateLabelContent1(DataLabelViewModel content, ContentControl currentControl)
+        internal ContentControl UpdateLabelContent(DataLabelViewModel content, ContentControl currentControl)
         {
             ContentControl control;
 

diff --git a/UwpView/StackedColumnSeries.cs b/UwpView/StackedColumnSeries.cs
@@ -185,7 +185,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/StackedRowSeries.cs b/UwpView/StackedRowSeries.cs
@@ -188,7 +188,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/StepLineSeries.cs b/UwpView/StepLineSeries.cs
@@ -218,7 +218,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/UwpView/VerticalLineSeries.cs b/UwpView/VerticalLineSeries.cs
@@ -195,7 +195,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/CandleSeries.cs b/WpfView/CandleSeries.cs
@@ -191,7 +191,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/ColumnSeries.cs b/WpfView/ColumnSeries.cs
@@ -188,7 +188,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/HeatSeries.cs b/WpfView/HeatSeries.cs
@@ -180,7 +180,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/LineSeries.cs b/WpfView/LineSeries.cs
@@ -304,7 +304,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/OhlcSeries.cs b/WpfView/OhlcSeries.cs
@@ -197,7 +197,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/PieSeries.cs b/WpfView/PieSeries.cs
@@ -160,7 +160,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/RowSeries.cs b/WpfView/RowSeries.cs
@@ -191,7 +191,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/ScatterSeries.cs b/WpfView/ScatterSeries.cs
@@ -176,7 +176,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/Series.cs b/WpfView/Series.cs
@@ -402,7 +402,7 @@ public object Configuration
 
         #region Internal Helpers
 
-        internal ContentControl UpdateLabelContent1(DataLabelViewModel content, ContentControl currentControl)
+        internal ContentControl UpdateLabelContent(DataLabelViewModel content, ContentControl currentControl)
         {
             ContentControl control;
 

diff --git a/WpfView/StackedColumnSeries.cs b/WpfView/StackedColumnSeries.cs
@@ -184,7 +184,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/StackedRowSeries.cs b/WpfView/StackedRowSeries.cs
@@ -187,7 +187,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/StepLineSeries.cs b/WpfView/StepLineSeries.cs
@@ -219,7 +219,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels)
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance

diff --git a/WpfView/VerticalLineSeries.cs b/WpfView/VerticalLineSeries.cs
@@ -196,7 +196,7 @@ public override IChartPointView GetPointView(ChartPoint point, string label)
 
             if (DataLabels )
             {
-                pbv.DataLabel = UpdateLabelContent1(new DataLabelViewModel
+                pbv.DataLabel = UpdateLabelContent(new DataLabelViewModel
                 {
                     FormattedText = label,
                     Instance = point.Instance