projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert pango dependency to version 2.20
[pspp-builds.git]
/
src
/
output
/
charts
/
plot-chart.h
diff --git
a/src/output/charts/plot-chart.h
b/src/output/charts/plot-chart.h
index dae1cc07a1adcb30dd81f58b48eaec53d1874292..896b630b137e7245f679c15c5437e7b8a47168fe 100644
(file)
--- a/
src/output/charts/plot-chart.h
+++ b/
src/output/charts/plot-chart.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004
, 2009
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
@@
-14,6
+14,10
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef PLOT_CHART_H
+#define PLOT_CHART_H
+
+#include <cairo/cairo.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
@@
-25,48
+29,70
@@
#include <math/chart-geometry.h>
#include <output/chart.h>
#include <math/chart-geometry.h>
#include <output/chart.h>
+#include <output/chart-provider.h>
+#include <libpspp/compiler.h>
#include <libpspp/str.h>
#include <output/manager.h>
#include <output/output.h>
#include <libpspp/str.h>
#include <output/manager.h>
#include <output/output.h>
-#include "xalloc.h"
+#define N_CHART_COLOURS 9
+extern const struct chart_colour data_colour[];
-#ifndef PLOT_CHART_H
-#define PLOT_CHART_H
+enum tick_orientation
+ {
+ TICK_ABSCISSA=0,
+ TICK_ORDINATE
+ };
+
+struct chart_geometry;
-extern const char *const data_colour[];
+enum marker_type
+ {
+ MARKER_CIRCLE, /* Hollow circle. */
+ MARKER_ASTERISK, /* Asterisk (*). */
+ MARKER_SQUARE /* Hollow square. */
+ };
-enum tick_orientation {
- TICK_ABSCISSA=0,
- TICK_ORDINATE
-};
+void chart_draw_marker (cairo_t *, double x, double y, enum marker_type,
+ double size);
+void chart_label (cairo_t *, int horz_justify, int vert_justify,
+ double font_size, const char *);
/* Draw a tick mark at position
If label is non zero, then print it at the tick mark
*/
/* Draw a tick mark at position
If label is non zero, then print it at the tick mark
*/
-void draw_tick(
struct chart *chart
,
+void draw_tick(
cairo_t *, const struct chart_geometry *
,
enum tick_orientation orientation,
double position,
enum tick_orientation orientation,
double position,
- const char *label, ...);
+ const char *label, ...)
+ PRINTF_FORMAT (5, 6);
/* Write the title on a chart*/
/* Write the title on a chart*/
-void chart_write_title(struct chart *chart, const char *title, ...);
+void chart_write_title(cairo_t *, const struct chart_geometry *,
+ const char *title, ...)
+ PRINTF_FORMAT (3, 4);
/* Set the scale for the abscissa */
/* Set the scale for the abscissa */
-void chart_write_xscale(struct chart *ch, double min, double max, int ticks);
+void chart_write_xscale(cairo_t *, struct chart_geometry *,
+ double min, double max, int ticks);
/* Set the scale for the ordinate */
/* Set the scale for the ordinate */
-void chart_write_yscale(struct chart *ch, double smin, double smax, int ticks);
+void chart_write_yscale(cairo_t *, struct chart_geometry *,
+ double smin, double smax, int ticks);
-void chart_write_xlabel(struct chart *ch, const char *label) ;
+void chart_write_xlabel(cairo_t *, const struct chart_geometry *,
+ const char *label) ;
/* Write the ordinate label */
/* Write the ordinate label */
-void chart_write_ylabel(struct chart *ch, const char *label);
+void chart_write_ylabel(cairo_t *, const struct chart_geometry *,
+ const char *label);
+
+void chart_write_legend (cairo_t *, const struct chart_geometry *);
#endif
#endif