projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format: Reduce size of struct fmt_spec from 6 bytes to 4.
[pspp]
/
src
/
output
/
charts
/
np-plot.c
diff --git
a/src/output/charts/np-plot.c
b/src/output/charts/np-plot.c
index a140230e06282ed306ccf86e823e6a2d698a020c..b0235924f8a471468be736b0d4fdee281e8f4e69 100644
(file)
--- a/
src/output/charts/np-plot.c
+++ b/
src/output/charts/np-plot.c
@@
-23,11
+23,11
@@
#include "data/casereader.h"
#include "libpspp/cast.h"
#include "math/np.h"
#include "data/casereader.h"
#include "libpspp/cast.h"
#include "math/np.h"
-#include "output/chart-
item-
provider.h"
+#include "output/chart-provider.h"
#include "gl/minmax.h"
#include "gl/minmax.h"
-static struct chart
_item
*
+static struct chart *
make_np_plot (const struct np *np, const struct casereader *reader,
const char *label, bool detrended)
{
make_np_plot (const struct np *np, const struct casereader *reader,
const char *label, bool detrended)
{
@@
-37,7
+37,7
@@
make_np_plot (const struct np *np, const struct casereader *reader,
return NULL;
npp = xzalloc (sizeof *npp);
return NULL;
npp = xzalloc (sizeof *npp);
- chart_i
tem_init (&npp->chart_item
, &np_plot_chart_class, label);
+ chart_i
nit (&npp->chart
, &np_plot_chart_class, label);
npp->data = casereader_clone (reader);
npp->y_min = np->y_min;
npp->y_max = np->y_max;
npp->data = casereader_clone (reader);
npp->y_min = np->y_min;
npp->y_max = np->y_max;
@@
-58,7
+58,7
@@
make_np_plot (const struct np *np, const struct casereader *reader,
npp->x_upper = MAX (np->y_max, (npp->y_last - npp->intercept) / npp->slope);
npp->slack = (npp->x_upper - npp->x_lower) * 0.05;
npp->x_upper = MAX (np->y_max, (npp->y_last - npp->intercept) / npp->slope);
npp->slack = (npp->x_upper - npp->x_lower) * 0.05;
- return &npp->chart
_item
;
+ return &npp->chart;
}
/* Creates and returns a normal probability plot corresponding to
}
/* Creates and returns a normal probability plot corresponding to
@@
-69,7
+69,7
@@
make_np_plot (const struct np *np, const struct casereader *reader,
Returns a null pointer if the data set is empty.
The caller retains ownership of NP and READER. */
Returns a null pointer if the data set is empty.
The caller retains ownership of NP and READER. */
-struct chart
_item
*
+struct chart *
np_plot_create (const struct np *np, const struct casereader *reader,
const char *label)
{
np_plot_create (const struct np *np, const struct casereader *reader,
const char *label)
{
@@
-85,7
+85,7
@@
np_plot_create (const struct np *np, const struct casereader *reader,
Returns a null pointer if the data set is empty.
The caller retains ownership of NP and READER. */
Returns a null pointer if the data set is empty.
The caller retains ownership of NP and READER. */
-struct chart
_item
*
+struct chart *
dnp_plot_create (const struct np *np, const struct casereader *reader,
const char *label)
{
dnp_plot_create (const struct np *np, const struct casereader *reader,
const char *label)
{
@@
-93,14
+93,14
@@
dnp_plot_create (const struct np *np, const struct casereader *reader,
}
static void
}
static void
-np_plot_chart_destroy (struct chart
_item *chart_item
)
+np_plot_chart_destroy (struct chart
*chart
)
{
{
- struct np_plot_chart *npp = to_np_plot_chart (chart
_item
);
+ struct np_plot_chart *npp = to_np_plot_chart (chart);
casereader_destroy (npp->data);
free (npp);
}
casereader_destroy (npp->data);
free (npp);
}
-const struct chart_
item_
class np_plot_chart_class =
+const struct chart_class np_plot_chart_class =
{
np_plot_chart_destroy
};
{
np_plot_chart_destroy
};