projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
render: Add comment.
[pspp]
/
src
/
output
/
cairo-chart.c
diff --git
a/src/output/cairo-chart.c
b/src/output/cairo-chart.c
index 802aa07bd2a177ea39e12b8b26921999685f459c..00eb98f5f91b0915ad6c129934c3e16e6dfaef25 100644
(file)
--- a/
src/output/cairo-chart.c
+++ b/
src/output/cairo-chart.c
@@
-1,5
+1,6
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2004, 2009, 2010, 2011, 2014, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2009, 2010, 2011, 2014, 2015,
+ 2020 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-19,7
+20,6
@@
#include "output/cairo-chart.h"
#include "math/chart-geometry.h"
#include "output/cairo-chart.h"
#include "math/chart-geometry.h"
-#include <assert.h>
#include <cairo/cairo.h>
#include <pango/pango.h>
#include <pango/pangocairo.h>
#include <cairo/cairo.h>
#include <pango/pango.h>
#include <pango/pangocairo.h>
@@
-309,7
+309,7
@@
draw_tick_internal (cairo_t *cr, const struct xrchart_geometry *geom,
if (orientation == SCALE_ABSCISSA)
{
if (orientation == SCALE_ABSCISSA)
{
- if (
rotated)
+ if (rotated)
xrchart_label_rotate (cr, 'l', 'c', geom->font_size, s, -G_PI_4);
else
xrchart_label (cr, 'c', 't', geom->font_size, s);
xrchart_label_rotate (cr, 'l', 'c', geom->font_size, s, -G_PI_4);
else
xrchart_label (cr, 'c', 't', geom->font_size, s);
@@
-366,7
+366,7
@@
xrchart_text_extents (cairo_t *cr, const struct xrchart_geometry *geom,
pango_font_description_free (desc);
}
pango_font_description_free (desc);
}
-static
void
+static
bool
xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
double smin, double smax, enum tick_orientation orient)
{
xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
double smin, double smax, enum tick_orientation orient)
{
@@
-380,6
+380,9
@@
xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
char *tick_format_string;
bool tickoversize = false;
char *tick_format_string;
bool tickoversize = false;
+ if (smax == smin)
+ return false;
+
chart_get_scale (smax, smin, &lower, &interval, &ticks);
tick_format_string = chart_get_ticks_format (lower, interval, ticks, &tickscale);
chart_get_scale (smax, smin, &lower, &interval, &ticks);
tick_format_string = chart_get_ticks_format (lower, interval, ticks, &tickscale);
@@
-389,8
+392,9
@@
xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
geom->axis[orient].max = upper;
geom->axis[orient].min = lower;
geom->axis[orient].max = upper;
geom->axis[orient].min = lower;
- geom->axis[orient].scale = (fabs (geom->axis[orient].data_max - geom->axis[orient].data_min)
- / fabs (geom->axis[orient].max - geom->axis[orient].min));
+ struct xrchart_axis *axis = &geom->axis[orient];
+ geom->axis[orient].scale = (fabs ((double) axis->data_max - axis->data_min)
+ / fabs (axis->max - axis->min));
if (orient == SCALE_ABSCISSA)
{
if (orient == SCALE_ABSCISSA)
{
@@
-417,22
+421,24
@@
xrchart_write_scale (cairo_t *cr, struct xrchart_geometry *geom,
pos += interval;
}
free(tick_format_string);
pos += interval;
}
free(tick_format_string);
+
+ return true;
}
/* Set the scale for the ordinate */
}
/* Set the scale for the ordinate */
-void
+bool
xrchart_write_yscale (cairo_t *cr, struct xrchart_geometry *geom,
double smin, double smax)
{
xrchart_write_yscale (cairo_t *cr, struct xrchart_geometry *geom,
double smin, double smax)
{
- xrchart_write_scale (cr, geom, smin, smax, SCALE_ORDINATE);
+
return
xrchart_write_scale (cr, geom, smin, smax, SCALE_ORDINATE);
}
/* Set the scale for the abscissa */
}
/* Set the scale for the abscissa */
-void
+bool
xrchart_write_xscale (cairo_t *cr, struct xrchart_geometry *geom,
double smin, double smax)
{
xrchart_write_xscale (cairo_t *cr, struct xrchart_geometry *geom,
double smin, double smax)
{
- xrchart_write_scale (cr, geom, smin, smax, SCALE_ABSCISSA);
+
return
xrchart_write_scale (cr, geom, smin, smax, SCALE_ABSCISSA);
}
}
@@
-469,7
+475,7
@@
xrchart_write_legend (cairo_t *cr, const struct xrchart_geometry *geom)
const int swatch = 20;
const int legend_top = geom->axis[SCALE_ORDINATE].data_max;
const int legend_bottom = legend_top -
const int swatch = 20;
const int legend_top = geom->axis[SCALE_ORDINATE].data_max;
const int legend_bottom = legend_top -
- (vstep * geom->n_datasets + 2 * ypad
);
+ (vstep * geom->n_datasets + 2 * ypad);
cairo_save (cr);
cairo_save (cr);
@@
-478,7
+484,7
@@
xrchart_write_legend (cairo_t *cr, const struct xrchart_geometry *geom)
legend_bottom - legend_top);
cairo_stroke (cr);
legend_bottom - legend_top);
cairo_stroke (cr);
- for (i = 0 ; i < geom->n_datasets ; ++i
)
+ for (i = 0 ; i < geom->n_datasets ; ++i)
{
const int ypos = legend_top - vstep * (i + 1);
const int xpos = geom->legend_left + xpad;
{
const int ypos = legend_top - vstep * (i + 1);
const int xpos = geom->legend_left + xpad;
@@
-578,10
+584,10
@@
xrchart_line(cairo_t *cr, const struct xrchart_geometry *geom,
double x1, y1;
double x2, y2;
double x1, y1;
double x2, y2;
- if (
lim_dim == XRCHART_DIM_Y
)
+ if (
lim_dim == XRCHART_DIM_Y
)
{
{
- x1 = (
limit1 - intercept
) / slope;
- x2 = (
limit2 - intercept
) / slope;
+ x1 = (
limit1 - intercept
) / slope;
+ x2 = (
limit2 - intercept
) / slope;
y1 = limit1;
y2 = limit2;
}
y1 = limit1;
y2 = limit2;
}