projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed double-counted sample size
[pspp-builds.git]
/
src
/
barchart.c
diff --git
a/src/barchart.c
b/src/barchart.c
index e47a541ae0257dd087fd7f160a36d35f8b078cec..5c00d4f5c1954ad07a42f08f93709296db63179d 100644
(file)
--- a/
src/barchart.c
+++ b/
src/barchart.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <stdio.h>
#include <stdio.h>
@@
-89,7
+89,7
@@
static const char subcat_name[]="Gender";
struct subcat {
const double *data;
struct subcat {
const double *data;
- c
har
*label;
+ c
onst char
*label;
};
static const struct subcat sub_catagory[SUB_CATAGORIES] =
};
static const struct subcat sub_catagory[SUB_CATAGORIES] =
@@
-114,7
+114,6
@@
void
draw_barchart(struct chart *ch, const char *title,
const char *xlabel, const char *ylabel, enum bar_opts opt)
{
draw_barchart(struct chart *ch, const char *title,
const char *xlabel, const char *ylabel, enum bar_opts opt)
{
-
double d;
int i;
double d;
int i;
@@
-122,11
+121,12
@@
draw_barchart(struct chart *ch, const char *title,
double bar_width = interval_size / 1.1 ;
double bar_width = interval_size / 1.1 ;
+ double ordinate_scale = fabs(ch->data_top - ch->data_bottom) /
+ fabs(y_max - y_min) ;
+
if ( opt != BAR_STACKED )
bar_width /= SUB_CATAGORIES;
if ( opt != BAR_STACKED )
bar_width /= SUB_CATAGORIES;
- double ordinate_scale = fabs(ch->data_top - ch->data_bottom) / fabs(y_max - y_min) ;
-
/* Move to data bottom-left */
pl_move_r(ch->lp, ch->data_left, ch->data_bottom);
/* Move to data bottom-left */
pl_move_r(ch->lp, ch->data_left, ch->data_bottom);