Scatter: Added SetSequentialX and SetFastViewX in demo

git-svn-id: svn://ultimatepp.org/upp/trunk@2409 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2010-05-18 20:47:52 +00:00
parent b60d3bfa07
commit 4412fb8766
3 changed files with 66 additions and 1 deletions

View file

@ -369,7 +369,7 @@ Tab8::Tab8()
scatter8.AddSeries(s1,"Temperature",true).SetPattern(LINE_DASHED);
s2<<XY(1,1010)<<XY(2,1012)<<XY(3,1015)<<XY(4,1013)<<XY(5,1017)<<XY(6,1018)<<XY(7,1010)<<XY(8,1007)<<XY(9,1003)<<XY(10,1001)<<XY(11,1000)<<XY(12,1002);
scatter8.AddSeries(s2,"Pressure",true,LtRed).SetPattern("oooooo...ooo...o...ooo...").SetDataPrimaryY(1, false);
scatter8.AddSeries(s2,"Pressure",true,LtRed).SetPattern("oooooo...ooo...o...ooo...").SetDataPrimaryY(false);
scatter8.SetDrawY2Reticle();
s3<<XY(1,-20)<<XY(2,-20)<<XY(2,-10)<<XY(3,-10)<<XY(3,0)<<XY(4,0)<<XY(4,10)<<XY(5,10)<<XY(5,20)<<XY(6,20)<<XY(6,30)<<XY(7,30)<<XY(7,20)<<XY(8,20)<<XY(8,10);
@ -389,6 +389,47 @@ Tab8::Tab8()
//******************************************************************************************
class Tab9 : public WithTab9<ParentCtrl> {
public:
typedef Tab9 CLASSNAME;
Tab9();
void OnFastView();
void OnSequentialX();
};
void Tab9::OnFastView()
{
scatter9.SetFastViewX(fastView);
}
void Tab9::OnSequentialX()
{
scatter9.SetSequentialXAll(sequentialX);
}
Tab9::Tab9()
{
CtrlLayout(*this);
HSizePos().VSizePos();
scatter9.SetRange(100000,40).SetXYMin(0, -20);
scatter9.SetMouseHandling(true).SetMaxZoom(500000).SetMinZoom(2);
Vector<XY> s1,s2;
for (int t = 0; t < 100000; ++t) {
s1<<XY(t,20*sin(2*M_PI*t/100000));
s2<<XY(t,15*cos(2*M_PI*t/100000));
}
scatter9.AddSeries(s1,"series1",true,LtBlue);
scatter9.AddSeries(s2,"series2",true,LtRed);
scatter9.ShowInfo();
fastView.WhenAction = THISBACK(OnFastView);
sequentialX.WhenAction = THISBACK(OnSequentialX);
}
//******************************************************************************************
class TestScatter2 : public WithTestScatter2Layout<TopWindow> {
Tab1 tab1;
@ -399,6 +440,7 @@ class TestScatter2 : public WithTestScatter2Layout<TopWindow> {
Tab6 tab6;
Tab7 tab7;
Tab8 tab8;
Tab9 tab9;
typedef TestScatter2 CLASSNAME;

View file

@ -54,3 +54,9 @@ LAYOUT(Tab8, 400, 316)
ITEM(Scatter, scatter8, SetLegendWeight(200).H_Border(50).V_Border(50).SetTitle(t_("Temperature & Pressure Averages. X-Y Axis mouse zoom + scroll")).SetTitleFont(SansSerifZ(14).Bold()).SetLabelX(t_("Month")).SetLabelsFont(SansSerifZ(11)).HSizePosZ(16, 16).VSizePosZ(16, 16))
END_LAYOUT
LAYOUT(Tab9, 380, 304)
ITEM(Scatter, scatter9, SetTitle(t_("Big dataset")).SetTitleFont(SansSerifZ(14).Bold()).SetLabelsFont(StdFontZ(11)).HSizePosZ(16, 12).VSizePosZ(16, 28))
ITEM(Option, sequentialX, SetLabel(t_("SetSequentialX")).LeftPosZ(112, 92).BottomPosZ(8, 16))
ITEM(Option, fastView, SetLabel(t_("SetFastView")).LeftPosZ(16, 84).BottomPosZ(8, 16))
END_LAYOUT

View file

@ -28,6 +28,8 @@ TestScatter2::TestScatter2()
tc1.Add(tab8, "Secondary Y");
tc1.Add(tab9, "Big dataset");
b1 <<= THISBACK(Preview);
b2 <<= THISBACK(SavePNG);
b3 <<= THISBACK(SaveJPG);
@ -69,6 +71,9 @@ void TestScatter2::Preview()
case 7:
r.DrawDrawing(300,300,tab8.scatter8.GetDrawing().GetSize().cx,tab8.scatter8.GetDrawing().GetSize().cy, tab8.scatter8.GetDrawing());
break;
case 8:
r.DrawDrawing(300,300,tab9.scatter9.GetDrawing().GetSize().cx,tab9.scatter9.GetDrawing().GetSize().cy, tab9.scatter9.GetDrawing());
break;
}
Perform(r);
@ -105,6 +110,9 @@ void TestScatter2::SavePNG()
case 7:
encoder.SaveFile("scatter8.png",tab8.scatter8.GetImage(3));
break;
case 8:
encoder.SaveFile("scatter9.png",tab9.scatter9.GetImage(3));
break;
}
}
@ -140,6 +148,9 @@ void TestScatter2::SaveJPG()
case 7:
encoder.SaveFile("scatter8.jpg",tab8.scatter8.GetImage(3));
break;
case 8:
encoder.SaveFile("scatter9.jpg",tab9.scatter9.GetImage(3));
break;
}
}
@ -175,6 +186,9 @@ void TestScatter2::SaveEMF()
case 7:
tab8.scatter8.SaveAsMetafile("scatter8.emf");
break;
case 8:
tab9.scatter9.SaveAsMetafile("scatter9.emf");
break;
}
}
#endif
@ -209,6 +223,9 @@ void TestScatter2::SaveClipboard()
case 7:
tab8.scatter8.SaveToClipboard();
break;
case 8:
tab9.scatter9.SaveToClipboard();
break;
}
}