projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Redraw affected areas after de-selecting a region
[pspp-builds.git]
/
src
/
output
/
chart.h
diff --git
a/src/output/chart.h
b/src/output/chart.h
index 05f14af61e4c9baf44ea0d8286818f92a78b72c7..4da12ecfe5b0afba3ea7035680fca5b1ea1d9af9 100644
(file)
--- a/
src/output/chart.h
+++ b/
src/output/chart.h
@@
-1,23
+1,19
@@
-/* PSPP -
computes sample statistic
s.
+/* PSPP -
a program for statistical analysi
s.
Copyright (C) 2004 Free Software Foundation, Inc.
Copyright (C) 2004 Free Software Foundation, Inc.
- Written by John Darrington <john@darrington.wattle.id.au>
- 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 the Free Software Foundation; either version 2 of the
-
License, or
(at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include <config.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
@@
-28,10
+24,11
@@
#include <math/chart-geometry.h>
#include <libpspp/str.h>
#include <math/chart-geometry.h>
#include <libpspp/str.h>
-#include <libpspp/alloc.h>
#include "manager.h"
#include "output.h"
#include "manager.h"
#include "output.h"
+#include "xalloc.h"
+
#ifndef CHART_H
#define CHART_H
#ifndef CHART_H
#define CHART_H
@@
-50,10
+47,10
@@
struct chart {
char *file_name;
FILE *file;
char *file_name;
FILE *file;
- /* The geometry of the chart
+ /* The geometry of the chart
See diagram at the foot of this file.
*/
See diagram at the foot of this file.
*/
-
+
int data_top ;
int data_right ;
int data_bottom;
int data_top ;
int data_right ;
int data_bottom;
@@
-67,10
+64,12
@@
struct chart {
int legend_left ;
int legend_right ;
int legend_left ;
int legend_right ;
+ const char **dataset;
+ int n_datasets;
+
-
/* Default font size for the plot (if zero, then use plotter default) */
/* Default font size for the plot (if zero, then use plotter default) */
- int font_size;
+ int font_size;
char fill_colour[10];
char fill_colour[10];
@@
-81,6
+80,7
@@
struct chart {
double x_max;
double y_min;
double y_max;
double x_max;
double y_min;
double y_max;
+ bool in_path;
};
};
@@
-88,4
+88,11
@@
struct chart {
struct chart * chart_create(void);
void chart_submit(struct chart *ch);
struct chart * chart_create(void);
void chart_submit(struct chart *ch);
+/* Helper functions for output drivers that put each chart into a
+ separate file. */
+void chart_init_separate (struct chart *, const char *type,
+ const char *file_name_tmpl, int number);
+
+void chart_finalise_separate (struct chart *);
+
#endif
#endif