From 54dc708024fcce955507f368ed4cdf15a1eff149 Mon Sep 17 00:00:00 2001 From: koldo Date: Tue, 29 Sep 2020 17:05:52 +0000 Subject: [PATCH] ScatterDraw: legendLine initialized git-svn-id: svn://ultimatepp.org/upp/trunk@15162 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ScatterDraw/ScatterDraw.cpp | 1 + uppsrc/ScatterDraw/ScatterDraw.h | 2 ++ uppsrc/ScatterDraw/ScatterDraw.upp | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/uppsrc/ScatterDraw/ScatterDraw.cpp b/uppsrc/ScatterDraw/ScatterDraw.cpp index 2f005fe31..bb6b71674 100644 --- a/uppsrc/ScatterDraw/ScatterDraw.cpp +++ b/uppsrc/ScatterDraw/ScatterDraw.cpp @@ -561,6 +561,7 @@ ScatterDraw::ScatterBasicSeries::ScatterBasicSeries() { labelsDx = labelsDy = 0; labelsAlign = ALIGN_CENTER; showLegend = true; + legendLine = true; } void ScatterDraw::ScatterBasicSeries::Init(int index) { diff --git a/uppsrc/ScatterDraw/ScatterDraw.h b/uppsrc/ScatterDraw/ScatterDraw.h index 5a0d8e3b9..a85d5b82e 100644 --- a/uppsrc/ScatterDraw/ScatterDraw.h +++ b/uppsrc/ScatterDraw/ScatterDraw.h @@ -159,6 +159,7 @@ protected: ("barWidth", barWidth) ("isClosed", isClosed) ("showLegend", showLegend) + ("legendLine", legendLine) ; if (io.IsLoading()) { if (!IsNull(markP)) @@ -207,6 +208,7 @@ protected: % barWidth % isClosed % showLegend + % legendLine ; if (s.IsLoading()) { if (!IsNull(markP)) diff --git a/uppsrc/ScatterDraw/ScatterDraw.upp b/uppsrc/ScatterDraw/ScatterDraw.upp index db1832281..3d0737802 100644 --- a/uppsrc/ScatterDraw/ScatterDraw.upp +++ b/uppsrc/ScatterDraw/ScatterDraw.upp @@ -7,8 +7,8 @@ uses options(MSC) -D_SCL_SECURE_NO_WARNINGS; file - ScatterDraw.h, ScatterDraw.cpp, + ScatterDraw.h, DataSource.cpp, DataSource.h, Equation.cpp,