From 2bb416dc5d97dd1a8905f2ecbdae87bf07ebf370 Mon Sep 17 00:00:00 2001 From: koldo Date: Mon, 1 Feb 2021 10:00:44 +0000 Subject: [PATCH] ScatterDraw_Demo: Added demo with Null data git-svn-id: svn://ultimatepp.org/upp/trunk@15719 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- .../ScatterDraw_Demo/ScatterDraw_Demo.cpp | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/reference/ScatterDraw_Demo/ScatterDraw_Demo.cpp b/reference/ScatterDraw_Demo/ScatterDraw_Demo.cpp index 5954ecb7b..d0c6e9855 100644 --- a/reference/ScatterDraw_Demo/ScatterDraw_Demo.cpp +++ b/reference/ScatterDraw_Demo/ScatterDraw_Demo.cpp @@ -6,6 +6,8 @@ using namespace Upp; #include +void NullDataDemo(String fileName); + CONSOLE_APP_MAIN { StdLogSetup(LOG_COUT|LOG_FILE); @@ -48,8 +50,35 @@ CONSOLE_APP_MAIN SaveFile(fileName + ".pdf", pdf.Finish()); UppLog() << "\nSaved '" << fileName << "'"; + + NullDataDemo(fileName); + #ifdef flagDEBUG Cout() << "\nPress enter key to end"; ReadStdIn(); #endif } + +void NullDataDemo(String fileName) { + ScatterDraw scatter; + + UppLog() << "\nPreparing Null data scatter"; + + Vector s1 = {{1,14}, {2,65}, {3,29}, {Null,Null}, {5,40}, {6,50}, {7,Null}, {8,25}, {9,10}}; + + UppLog() << "\nScatter with Null data"; + + scatter.AddSeries(s1).Legend("Series null").Units("kW", "seg"); + + scatter.SetTitle("ScatterDraw Null data demo").SetTitleFont(SansSerif(14).Bold()); + scatter.SetFastViewX(true).SetSequentialXAll(true); + scatter.SetLabelY("Power").SetLabelX("Time").SetLabelsFont(SansSerif(12)); + scatter.SetPlotAreaLeftMargin(70).SetPlotAreaRightMargin(30).SetPlotAreaTopMargin(40).SetPlotAreaBottomMargin(50); + scatter.SetMode(ScatterDraw::MD_ANTIALIASED).SetLegendAnchor(ScatterDraw::RIGHT_TOP); + scatter.SetSize(Size(1000, 500)).ZoomToFit(true, true); + + fileName = fileName + " null data.png"; + PNGEncoder().SaveFile(fileName, scatter.GetImage()); + + UppLog() << "\nSaved '" << fileName << "'"; +} \ No newline at end of file