github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-19 06:06:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ScatterCtrl: now GTK backend compatible, fixed some warnings

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6104 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-05-26 15:55:18 +00:00
parent 73fc60fe6e
commit c262b72ec9
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/ScatterCtrl/ScatterCtrl.cpp
View file

@ -65,6 +65,8 @@ void ScatterCtrl::Paint(Draw& w)
} else {
ImageBuffer ib(GetSize());
BufferPainter bp(ib, mode);
bp.Clear(White());
PlotTexts(bp, GetSize(), 1);
ScatterCtrl::SetDrawing(bp, GetSize(), 1);
w.DrawImage(0, 0, ib);
PlotTexts(w, GetSize(), 1);
@ -233,12 +235,7 @@ void ScatterCtrl::Scrolling(bool down, Point &pt, bool isOut)
butDownY = pt.y;
isScrolling = true;
INTERLOCKED {
#ifdef PLATFORM_WIN32
static Image img = Win32Cursor(IDC_SIZEALL);
#else
static Image img = X11Cursor(XC_fleur);
#endif
mouseImg = Ctrl::OverrideCursor(img);
mouseImg = Ctrl::OverrideCursor(Image::SizeAll());
}
}
} else {

4
uppsrc/ScatterDraw/DataSource.h
View file

@ -135,7 +135,7 @@ private:
const Vector<double> *xData, *yData;
public:
VectorDouble(const Vector<double> &yData, Vector<double> &xData) : yData(&yData), xData(&xData) {}
VectorDouble(const Vector<double> &yData, Vector<double> &xData) : xData(&xData), yData(&yData) {}
virtual inline double y(int64 id) {return (*yData)[int(id)];}
virtual inline double x(int64 id) {return (*xData)[int(id)];}
virtual inline int64 GetCount() {return xData->GetCount();}
@ -146,7 +146,7 @@ private:
const Upp::Array<double> *xData, *yData;
public:
ArrayDouble(const Upp::Array<double> &yData, Upp::Array<double> &xData) : yData(&yData), xData(&xData) {}
ArrayDouble(const Upp::Array<double> &yData, Upp::Array<double> &xData) : xData(&xData), yData(&yData) {}
virtual inline double y(int64 id) {return (*yData)[int(id)];}
virtual inline double x(int64 id) {return (*xData)[int(id)];}
virtual inline int64 GetCount() {return xData->GetCount();}

5
uppsrc/ScatterDraw/PieDraw.cpp
View file

@ -215,8 +215,9 @@ Image PieDraw::GetImage(int scale)
return Image(idraw.GetResult());
}
PieDraw::PieDraw(): backColor(White), titleFont(StdFont(16)), titlePos(TOP), titleGap(2),
titleColor(Black), showPercent(true), percentBack(Null),
PieDraw::PieDraw(): backColor(White), titleFont(StdFont(16)),
titleColor(Black), titlePos(TOP), titleGap(2),
showPercent(true), percentBack(Null),
legendFont(StdFont()), legendTextColor(Black), legendBackColor(Null),
showLegend(true), legendLeft(10), legendTop(Null), legendWidth(60),
legendHeight(120), pieAngle(0), pieMarginLeft(40), pieMarginTop(40),

1
uppsrc/Skylark/App.cpp
View file

@ -97,7 +97,6 @@ void SkylarkApp::Quit()
s.Connect("127.0.0.1", port);
}
void SkylarkApp::Main()
{
Buffer<Thread> uwt(threads);

4
uppsrc/Skylark/src.tpp/SkylarkApp$en-us.tpp
View file

@ -90,6 +90,10 @@ the loop used to process Http requests.&]
[s2; This method should be called from APP`_MAIN to start Skylark
application. There can be only one SkylarkApp in single binary.&]
[s3; &]
[s4;%- &]
[s5;:SkylarkApp`:`:Quit`(`):%- [@(0.0.255) void]_[* Quit]()&]
[s2; Quits the Skylark application (can be called from another thread).&]
[s3;%- &]
[s4; &]
[s5;:SkylarkApp`:`:TheApp`(`):%- [@(0.0.255) static] [_^SkylarkApp^ SkylarkApp][@(0.0.255) `&
]_[* TheApp]()&]