.ScatterCtrl_Demo: BubblePlot

git-svn-id: svn://ultimatepp.org/upp/trunk@8691 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2015-07-16 18:02:33 +00:00
parent 249b2474ff
commit 08b45d5550
4 changed files with 10 additions and 10 deletions

View file

@ -213,9 +213,9 @@ private:
Vector<int> idsRange;
};
class TabBallPlot : public WithTabBallPlot<ScatterDemo> {
class TabBubblePlot : public WithTabBubblePlot<ScatterDemo> {
public:
typedef TabBallPlot CLASSNAME;
typedef TabBubblePlot CLASSNAME;
void Init();
virtual ScatterCtrl &Scatter() {return scatter;};

View file

@ -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

View file

@ -25,7 +25,7 @@ file
tab12.cpp,
tab14_UserEquation.cpp,
tab15_RangePlot.cpp,
tab16_BallPlot.cpp,
tab16_BubblePlot.cpp,
tab20_Pie.cpp,
symbol.iml;

View file

@ -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<int> idVoid;
scatter.AddSeries(s1, 1, 0, idVoid, idVoid, idsBall).Legend("Importance").MarkStyle<BallPlot>()
scatter.AddSeries(s1, 1, 0, idVoid, idVoid, idsBall).Legend("Importance").MarkStyle<BubblePlot>()
.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__);
}