diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2002-06-09 18:18:50 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2002-06-09 18:18:50 +0000 |
| commit | 464c7d8ba5b57b3022609d80fb4c305ccfc1cb06 (patch) | |
| tree | 76228cd973db8714307503b1fbfadfbe07654648 | |
| parent | 13ae564f03a3ea7dd86e218fb287363842371cba (diff) | |
Fl_Chart clips to and fills interior of box
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2300 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_Chart.cxx | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/Fl_Chart.cxx b/src/Fl_Chart.cxx index b3eabadc5..46077f20b 100644 --- a/src/Fl_Chart.cxx +++ b/src/Fl_Chart.cxx @@ -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). // @@ -229,31 +229,35 @@ static void draw_piechart(int x,int y,int w,int h, } void Fl_Chart::draw() { - int xx,yy,ww,hh; - int i; - xx = x()+9; - yy = y()+9; - ww = w()-2*9; - hh = h()-2*9; + draw_box(); + Fl_Boxtype b = box(); + int xx = x()+Fl::box_dx(b); // was 9 instead of dx... + 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) { 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 > max) max = entries[i].val; } } - draw_box(); fl_font(textfont(),textsize()); switch (type()) { case FL_BAR_CHART: + ww++; // makes the bars fill box correctly draw_barchart(xx,yy,ww,hh, numb, entries, min, max, autosize(), maxnumb, textcolor()); break; case FL_HORBAR_CHART: + hh++; // makes the bars fill box correctly draw_horbarchart(xx,yy,ww,hh, numb, entries, min, max, autosize(), maxnumb, textcolor()); break; @@ -269,6 +273,7 @@ void Fl_Chart::draw() { break; } 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 $". // |