diff --git a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.h b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.h index c5e6dd91f..c62b9ad97 100644 --- a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.h +++ b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.h @@ -213,9 +213,9 @@ private: Vector idsRange; }; -class TabBallPlot : public WithTabBallPlot { +class TabBubblePlot : public WithTabBubblePlot { public: - typedef TabBallPlot CLASSNAME; + typedef TabBubblePlot CLASSNAME; void Init(); virtual ScatterCtrl &Scatter() {return scatter;}; diff --git a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay index 94b1bf766..e8042ee7c 100644 --- a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay +++ b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay @@ -102,12 +102,12 @@ LAYOUT(TabRangePlot, 420, 236) ITEM(ScatterCtrl, scatter, SetTitle(t_("Range Plot")).SetPlotAreaLeftMargin(40).SetPlotAreaTopMargin(20).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).HSizePosZ(4, 4).VSizePosZ(4, 4)) END_LAYOUT -LAYOUT(TabBallPlot, 420, 236) - ITEM(ScatterCtrl, scatter, SetTitle(t_("Ball Plot")).SetPlotAreaLeftMargin(40).SetPlotAreaTopMargin(20).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).HSizePosZ(4, 4).VSizePosZ(4, 4)) +LAYOUT(TabBubblePlot, 420, 236) + ITEM(ScatterCtrl, scatter, SetTitle(t_("Bubble Plot")).SetPlotAreaLeftMargin(40).SetPlotAreaTopMargin(20).SetLabelsFont(StdFontZ(11)).SetTitleFont(SansSerifZ(14).Bold()).HSizePosZ(4, 4).VSizePosZ(4, 4)) END_LAYOUT LAYOUT(TabPie, 536, 440) - ITEM(PieCtrl, chart, SetLegendBackColor(Color(229, 229, 229)).SetLegendHeight(80).SetTitle(t_("Average Weather")).SetFrame(ThinInsetFrame()).HSizePosZ(8, 12).VSizePosZ(40, 12)) + ITEM(PieCtrl, chart, SetLegendHeight(80).SetLegendBackColor(Color(229, 229, 229)).SetTitle(t_("Average Weather")).SetFrame(ThinInsetFrame()).HSizePosZ(8, 12).VSizePosZ(40, 12)) ITEM(Label, dv___1, SetLabel(t_(" EXPERIMENTAL")).SetFrame(ThinInsetFrame()).LeftPosZ(8, 84).TopPosZ(8, 24)) END_LAYOUT diff --git a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.upp b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.upp index b0c9eb8ce..91c6660a9 100644 --- a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.upp +++ b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.upp @@ -25,7 +25,7 @@ file tab12.cpp, tab14_UserEquation.cpp, tab15_RangePlot.cpp, - tab16_BallPlot.cpp, + tab16_BubblePlot.cpp, tab20_Pie.cpp, symbol.iml; diff --git a/examples/ScatterCtrl_Demo/tab16_BallPlot.cpp b/examples/ScatterCtrl_Demo/tab16_BubblePlot.cpp similarity index 76% rename from examples/ScatterCtrl_Demo/tab16_BallPlot.cpp rename to examples/ScatterCtrl_Demo/tab16_BubblePlot.cpp index 30a2e7fd3..cb2012d0a 100644 --- a/examples/ScatterCtrl_Demo/tab16_BallPlot.cpp +++ b/examples/ScatterCtrl_Demo/tab16_BubblePlot.cpp @@ -1,7 +1,7 @@ #include "ScatterCtrl_Demo.h" -void TabBallPlot::Init() +void TabBubblePlot::Init() { CtrlLayout(*this); SizePos(); @@ -14,7 +14,7 @@ void TabBallPlot::Init() } idsBall << 2; static Vector idVoid; - scatter.AddSeries(s1, 1, 0, idVoid, idVoid, idsBall).Legend("Importance").MarkStyle() + scatter.AddSeries(s1, 1, 0, idVoid, idVoid, idsBall).Legend("Importance").MarkStyle() .NoPlot().MarkColor(Green()).MarkBorderColor(LtRed()).MarkBorderWidth(3); scatter.SetLabelY("Size"); @@ -23,10 +23,10 @@ void TabBallPlot::Init() ScatterDemo *Construct16() { - static TabBallPlot tab; + static TabBubblePlot tab; return &tab; } INITBLOCK { - RegisterExample("BallPlot", Construct16, __FILE__); + RegisterExample("BubblePlot", Construct16, __FILE__); } \ No newline at end of file