Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 11:25:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fl_Chart clips to and fills interior of box

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2300 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Bill Spitzak
2002-06-09 18:18:50 +00:00
parent 13ae564f03
commit 464c7d8ba5
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Chart.cxx
+15 -10
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Chart.cxx,v 1.5.2.6.2.7 2002/05/16 12:47:43 easysw Exp $" // "$Id: Fl_Chart.cxx,v 1.5.2.6.2.8 2002/06/09 18:18:50 spitzak Exp $"
// //
// Forms-compatible chart widget for the Fast Light Tool Kit (FLTK). // Forms-compatible chart widget for the Fast Light Tool Kit (FLTK).
// //
@@ -229,31 +229,35 @@ static void draw_piechart(int x,int y,int w,int h,
} }
void Fl_Chart::draw() { void Fl_Chart::draw() {
int xx,yy,ww,hh;
int i;
xx = x()+9; draw_box();
yy = y()+9; Fl_Boxtype b = box();
ww = w()-2*9; int xx = x()+Fl::box_dx(b); // was 9 instead of dx...
hh = h()-2*9; int yy = y()+Fl::box_dy(b);
int ww = w()-Fl::box_dw(b);
int hh = h()-Fl::box_dh(b);
fl_push_clip(xx, yy, ww, hh);
ww--; hh--; // adjust for line thickness
if (min >= max) { if (min >= max) {
min = max = 0.0; min = max = 0.0;
for (i=0; i<numb; i++) { for (int i=0; i<numb; i++) {
if (entries[i].val < min) min = entries[i].val; if (entries[i].val < min) min = entries[i].val;
if (entries[i].val > max) max = entries[i].val; if (entries[i].val > max) max = entries[i].val;
} }
} }
draw_box();
fl_font(textfont(),textsize()); fl_font(textfont(),textsize());
switch (type()) { switch (type()) {
case FL_BAR_CHART: case FL_BAR_CHART:
ww++; // makes the bars fill box correctly
draw_barchart(xx,yy,ww,hh, numb, entries, min, max, draw_barchart(xx,yy,ww,hh, numb, entries, min, max,
autosize(), maxnumb, textcolor()); autosize(), maxnumb, textcolor());
break; break;
case FL_HORBAR_CHART: case FL_HORBAR_CHART:
hh++; // makes the bars fill box correctly
draw_horbarchart(xx,yy,ww,hh, numb, entries, min, max, draw_horbarchart(xx,yy,ww,hh, numb, entries, min, max,
autosize(), maxnumb, textcolor()); autosize(), maxnumb, textcolor());
break; break;
@@ -269,6 +273,7 @@ void Fl_Chart::draw() {
break; break;
} }
draw_label(); draw_label();
fl_pop_clip();
} }
/*------------------------------*/ /*------------------------------*/
@@ -375,5 +380,5 @@ void Fl_Chart::maxsize(int m) {
} }
// //
// End of "$Id: Fl_Chart.cxx,v 1.5.2.6.2.7 2002/05/16 12:47:43 easysw Exp $". // End of "$Id: Fl_Chart.cxx,v 1.5.2.6.2.8 2002/06/09 18:18:50 spitzak Exp $".
// //