github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

TestScatter2: Added context menu

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3957 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2011-10-06 19:35:52 +00:00
parent 63e41d9b93
commit 4ed66cd247
3 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bazaar/TestScatter2/TestScatter2.h
View file

@ -29,7 +29,7 @@ Tab1::Tab1()
s2<<XY(20,34)<<XY(30,45)<<XY(40,49)<<XY(50,44)<<XY(60,56); s2<<XY(20,34)<<XY(30,45)<<XY(40,49)<<XY(50,44)<<XY(60,56);
scatter1.AddSeries(s1,"series1").Stroke().Mark(); scatter1.AddSeries(s1,"series1").Stroke().Mark();
scatter1.AddSeries(s2,"series2").Stroke().Mark(); scatter1.AddSeries(s2,"series2").Stroke().Mark();
scatter1.ShowInfo(); scatter1.ShowInfo().ShowContextMenu();
scatter1.SetPopText("h", "v", "v2"); scatter1.SetPopText("h", "v", "v2");
} }
@ -139,7 +139,7 @@ Tab4::Tab4()
scatter4.SetRange(13,50); scatter4.SetRange(13,50);
scatter4.SetMajorUnits(1,10); scatter4.SetMajorUnits(1,10);
scatter4.SetXYMin(0,-20); scatter4.SetXYMin(0,-20);
scatter4.SetMouseHandling(true); scatter4.SetMouseHandling(true).ShowContextMenu();
Vector<XY> s1,s2; Vector<XY> s1,s2;
s1<<XY(1,-6)<<XY(2,-4)<<XY(3,2)<<XY(4,8)<<XY(5,8)<<XY(6,15)<<XY(7,20)<<XY(8,25)<<XY(9,14)<<XY(10,10)<<XY(11,3)<<XY(12,-11); s1<<XY(1,-6)<<XY(2,-4)<<XY(3,2)<<XY(4,8)<<XY(5,8)<<XY(6,15)<<XY(7,20)<<XY(8,25)<<XY(9,14)<<XY(10,10)<<XY(11,3)<<XY(12,-11);
scatter4.AddSeries(s1,"2005").Stroke().Mark(); scatter4.AddSeries(s1,"2005").Stroke().Mark();
@ -191,8 +191,7 @@ Tab5::Tab5()
b6<<=(THISBACK(Plus)); b6<<=(THISBACK(Plus));
b7<<=(THISBACK(Minus)); b7<<=(THISBACK(Minus));
t=0.0; t=0.0;
b2.Disable(); b2.Disable();
} }
void Tab5::Animate() void Tab5::Animate()
@ -421,7 +420,7 @@ Tab8::Tab8()
scatter8.SetLabelY2("Pressure [mBar]"); scatter8.SetLabelY2("Pressure [mBar]");
scatter8.SetMarkStyle(1,Scatter::RECTANGLE); scatter8.SetMarkStyle(1,Scatter::RECTANGLE);
scatter8.SetMarkWidth(1,24); scatter8.SetMarkWidth(1,24);
scatter8.ShowInfo(); scatter8.ShowInfo().ShowContextMenu();
} }
//****************************************************************************************** //******************************************************************************************

3
bazaar/TestScatter2/TestScatter2.upp
View file

@ -4,8 +4,7 @@ uses
CtrlLib, CtrlLib,
Scatter, Scatter,
Report, Report,
PdfDraw, PdfDraw;
plugin\jpg;
file file
TestScatter2.h, TestScatter2.h,

39
bazaar/TestScatter2/main.cpp
View file

@ -2,7 +2,6 @@
#include <Report/Report.h> #include <Report/Report.h>
#include <PdfDraw/PdfDraw.h> #include <PdfDraw/PdfDraw.h>
#include <plugin/jpg/jpg.h>
#define IMAGECLASS MyImages #define IMAGECLASS MyImages
#define IMAGEFILE <TestScatter2/TestScatter2.iml> #define IMAGEFILE <TestScatter2/TestScatter2.iml>
@ -81,37 +80,36 @@ void TestScatter2::Preview()
void TestScatter2::SavePNG() void TestScatter2::SavePNG()
{ {
PNGEncoder encoder;
int ntab=tc1.Get(); int ntab=tc1.Get();
switch (ntab) switch (ntab)
{ {
case 0: case 0:
encoder.SaveFile("scatter1.png",tab1.scatter1.GetImage(3)); tab1.scatter1.SaveToImage("scatter1.png");
break; break;
case 1: case 1:
encoder.SaveFile("scatter2.png",tab2.scatter2.GetImage(3)); tab2.scatter2.SaveToImage("scatter2.png");
break; break;
case 2: case 2:
encoder.SaveFile("scatter3.png",tab3.scatter3.GetImage(3)); tab3.scatter3.SaveToImage("scatter3.png");
break; break;
case 3: case 3:
encoder.SaveFile("scatter4.png",tab4.scatter4.GetImage(3)); tab4.scatter4.SaveToImage("scatter4.png");
break; break;
case 4: case 4:
encoder.SaveFile("scatter5.png",tab5.scatter5.GetImage(3)); tab5.scatter5.SaveToImage("scatter5.png");
break; break;
case 5: case 5:
encoder.SaveFile("scatter6.png",tab6.scatter6.GetImage(3)); tab6.scatter6.SaveToImage("scatter6.png");
break; break;
case 6: case 6:
encoder.SaveFile("scatter7.png",tab7.scatter7.GetImage(3)); tab7.scatter7.SaveToImage("scatter7.png");
break; break;
case 7: case 7:
encoder.SaveFile("scatter8.png",tab8.scatter8.GetImage(3)); tab8.scatter8.SaveToImage("scatter8.png");
break; break;
case 8: case 8:
encoder.SaveFile("scatter9.png",tab9.scatter9.GetImage(3)); tab9.scatter9.SaveToImage("scatter9.png");
break; break;
} }
@ -119,37 +117,36 @@ void TestScatter2::SavePNG()
void TestScatter2::SaveJPG() void TestScatter2::SaveJPG()
{ {
JPGEncoder encoder(90);
int ntab=tc1.Get(); int ntab=tc1.Get();
switch (ntab) switch (ntab)
{ {
case 0: case 0:
encoder.SaveFile("scatter1.jpg",tab1.scatter1.GetImage(3)); tab1.scatter1.SaveToImage("scatter1.jpg");
break; break;
case 1: case 1:
encoder.SaveFile("scatter2.jpg",tab2.scatter2.GetImage(3)); tab2.scatter2.SaveToImage("scatter2.jpg");
break; break;
case 2: case 2:
encoder.SaveFile("scatter3.jpg",tab3.scatter3.GetImage(3)); tab3.scatter3.SaveToImage("scatter3.jpg");
break; break;
case 3: case 3:
encoder.SaveFile("scatter4.jpg",tab4.scatter4.GetImage(3)); tab4.scatter4.SaveToImage("scatter4.jpg");
break; break;
case 4: case 4:
encoder.SaveFile("scatter5.jpg",tab5.scatter5.GetImage(3)); tab5.scatter5.SaveToImage("scatter5.jpg");
break; break;
case 5: case 5:
encoder.SaveFile("scatter6.jpg",tab6.scatter6.GetImage(3)); tab6.scatter6.SaveToImage("scatter6.jpg");
break; break;
case 6: case 6:
encoder.SaveFile("scatter7.jpg",tab7.scatter7.GetImage(3)); tab7.scatter7.SaveToImage("scatter7.jpg");
break; break;
case 7: case 7:
encoder.SaveFile("scatter8.jpg",tab8.scatter8.GetImage(3)); tab8.scatter8.SaveToImage("scatter8.jpg");
break; break;
case 8: case 8:
encoder.SaveFile("scatter9.jpg",tab9.scatter9.GetImage(3)); tab9.scatter9.SaveToImage("scatter9.jpg");
break; break;
} }