From f09e17c3c564e8310125a10c03397cbf473ff643 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 1 Jul 2020 18:03:10 +0200 Subject: Remove $Id$ tags, update URL's, and more - remove obsolete svn '$Id$' tags from all source files - update .fl files and generated files accordingly - replace 'http://www.fltk.org' URL's with 'https://...' - replace bug report URL 'str.php' with 'bugs.php' - remove trailing whitespace - fix other whitespace errors flagged by Git - add and/or fix missing or wrong standard headers - convert tabs to spaces in all source files The only relevant code changes are in the fluid/ folder where some .fl files and other source files were used to generate the '$Id' headers and footers. --- src/Fl_Chart.cxx | 160 ++++++++++++++++++++++++++----------------------------- 1 file changed, 77 insertions(+), 83 deletions(-) (limited to 'src/Fl_Chart.cxx') diff --git a/src/Fl_Chart.cxx b/src/Fl_Chart.cxx index a381155bb..e7a30fc92 100644 --- a/src/Fl_Chart.cxx +++ b/src/Fl_Chart.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Forms-compatible chart widget for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2010 by Bill Spitzak and others. @@ -9,11 +7,11 @@ // the file "COPYING" which should have been included with this file. If this // file is missing or damaged, see the license at: // -// http://www.fltk.org/COPYING.php +// https://www.fltk.org/COPYING.php // -// Please report all bugs and problems on the following page: +// Please see the following page on how to report bugs and issues: // -// http://www.fltk.org/str.php +// https://www.fltk.org/bugs.php // #include @@ -23,7 +21,7 @@ #include "flstring.h" #include -#define ARCINC (2.0*M_PI/360.0) +#define ARCINC (2.0*M_PI/360.0) // this function is in fl_boxtype.cxx: void fl_rectbound(int x,int y,int w,int h, Fl_Color color); @@ -31,9 +29,9 @@ void fl_rectbound(int x,int y,int w,int h, Fl_Color color); /* Widget specific information */ static void draw_barchart(int x,int y,int w,int h, - int numb, FL_CHART_ENTRY entries[], - double min, double max, int autosize, int maxnumb, - Fl_Color textcolor) + int numb, FL_CHART_ENTRY entries[], + double min, double max, int autosize, int maxnumb, + Fl_Color textcolor) /* Draws a bar chart. x,y,w,h is the bounding box, entries the array of numb entries and min and max the boundaries. */ { @@ -58,27 +56,27 @@ static void draw_barchart(int x,int y,int w,int h, for (i=0; i 0) - fl_rectbound(x+i*bwidth,zeroh-hh,bwidth+1,hh+1,(Fl_Color)entries[i].col); + fl_rectbound(x+i*bwidth,zeroh-hh,bwidth+1,hh+1,(Fl_Color)entries[i].col); } /* Draw the labels */ fl_color(textcolor); for (i=0; i 0) - fl_rectbound(zeroh,y+i*bwidth,ww+1,bwidth+1, (Fl_Color)entries[i].col); + fl_rectbound(zeroh,y+i*bwidth,ww+1,bwidth+1, (Fl_Color)entries[i].col); else if (ww < 0) - fl_rectbound(zeroh+ww,y+i*bwidth,-ww+1,bwidth+1,(Fl_Color)entries[i].col); + fl_rectbound(zeroh+ww,y+i*bwidth,-ww+1,bwidth+1,(Fl_Color)entries[i].col); } /* Draw the labels */ fl_color(textcolor); for (i=0; i0.0)!=(entries[i].val>0.0)) { - double ttt = entries[i-1].val/(entries[i-1].val-entries[i].val); - int xt = x + (int)rint((i-.5+ttt)*bwidth); - fl_polygon(x0,zeroh, x0,yy0, xt,zeroh); - fl_polygon(xt,zeroh, x1,yy1, x1,zeroh); - } else { - fl_polygon(x0,zeroh, x0,yy0, x1,yy1, x1,zeroh); - } - fl_color(textcolor); - fl_line(x0,yy0,x1,yy1); + fl_color((Fl_Color)entries[i-1].col); + if ((entries[i-1].val>0.0)!=(entries[i].val>0.0)) { + double ttt = entries[i-1].val/(entries[i-1].val-entries[i].val); + int xt = x + (int)rint((i-.5+ttt)*bwidth); + fl_polygon(x0,zeroh, x0,yy0, xt,zeroh); + fl_polygon(xt,zeroh, x1,yy1, x1,zeroh); + } else { + fl_polygon(x0,zeroh, x0,yy0, x1,yy1, x1,zeroh); + } + fl_color(textcolor); + fl_line(x0,yy0,x1,yy1); } } /* Draw base line */ @@ -162,22 +160,22 @@ static void draw_linechart(int type, int x,int y,int w,int h, /* Draw the labels */ for (i=0; i=0 ? FL_ALIGN_BOTTOM : FL_ALIGN_TOP); + x+(int)rint((i+.5)*bwidth), zeroh - (int)rint(entries[i].val*incr),0,0, + entries[i].val>=0 ? FL_ALIGN_BOTTOM : FL_ALIGN_TOP); } static void draw_piechart(int x,int y,int w,int h, - int numb, FL_CHART_ENTRY entries[], int special, - Fl_Color textcolor) + int numb, FL_CHART_ENTRY entries[], int special, + Fl_Color textcolor) /* Draws a pie chart. x,y,w,h is the bounding box, entries the array of numb entries */ { int i; - double xc,yc,rad; /* center and radius */ - double tot; /* sum of values */ - double incr; /* increment in angle */ - double curang; /* current angle we are drawing */ - double txc,tyc; /* temporary center */ + double xc,yc,rad; /* center and radius */ + double tot; /* sum of values */ + double incr; /* increment in angle */ + double curang; /* current angle we are drawing */ + double txc,tyc; /* temporary center */ double lh = fl_height(); /* compute center and radius */ double h_denom = (special ? 2.3 : 2.0); @@ -213,10 +211,10 @@ static void draw_piechart(int x,int y,int w,int h, /* draw the label */ double xl = txc + 1.1*rad*cos(ARCINC*curang); fl_draw(entries[i].str, - (int)rint(xl), - (int)rint(tyc - 1.1*rad*sin(ARCINC*curang)), - 0, 0, - xl= max) { - min = max = 0.0; - for (int i=0; i max) max = entries[i].val; - } + min = max = 0.0; + for (int i=0; i max) max = entries[i].val; + } } 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; + 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; + hh++; // makes the bars fill box correctly + draw_horbarchart(xx,yy,ww,hh, numb, entries, min, max, + autosize(), maxnumb, textcolor()); + break; case FL_PIE_CHART: - draw_piechart(xx,yy,ww,hh,numb,entries,0, textcolor()); - break; + draw_piechart(xx,yy,ww,hh,numb,entries,0, textcolor()); + break; case FL_SPECIALPIE_CHART: - draw_piechart(xx,yy,ww,hh,numb,entries,1,textcolor()); - break; + draw_piechart(xx,yy,ww,hh,numb,entries,1,textcolor()); + break; default: - draw_linechart(type(),xx,yy,ww,hh, numb, entries, min, max, - autosize(), maxnumb, textcolor()); - break; + draw_linechart(type(),xx,yy,ww,hh, numb, entries, min, max, + autosize(), maxnumb, textcolor()); + break; } draw_label(); fl_pop_clip(); @@ -271,10 +269,10 @@ void Fl_Chart::draw() { /*------------------------------*/ -#define FL_CHART_BOXTYPE FL_BORDER_BOX -#define FL_CHART_COL1 FL_COL1 -#define FL_CHART_LCOL FL_LCOL -#define FL_CHART_ALIGN FL_ALIGN_BOTTOM +#define FL_CHART_BOXTYPE FL_BORDER_BOX +#define FL_CHART_COL1 FL_COL1 +#define FL_CHART_LCOL FL_LCOL +#define FL_CHART_ALIGN FL_ALIGN_BOTTOM /** Create a new Fl_Chart widget using the given position, size and label string. @@ -334,9 +332,9 @@ void Fl_Chart::add(double val, const char *str, unsigned col) { entries[numb].val = float(val); entries[numb].col = col; if (str) { - strlcpy(entries[numb].str,str,FL_CHART_LABEL_MAX + 1); + strlcpy(entries[numb].str,str,FL_CHART_LABEL_MAX + 1); } else { - entries[numb].str[0] = 0; + entries[numb].str[0] = 0; } numb++; redraw(); @@ -416,12 +414,8 @@ void Fl_Chart::maxsize(int m) { /* Shift entries if required */ if (numb > maxnumb) { for (i = 0; i