-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
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
+ GNU General Public License for more details.
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 <math.h>
-#include "chart.h"
#include <assert.h>
-#include "plot-chart.h"
-#include "cartesian.h"
-#include "compiler.h"
-
-
-
-struct dataset
-{
- int n_data;
- const char *label;
-};
-
-
-#define DATASETS 2
-
-static const struct dataset dataset[DATASETS] =
- {
- { 13, "male"},
- { 11, "female"},
- };
-
-
-
-static void
-write_legend(struct chart *chart, const char *heading, int n);
+#include <output/chart.h>
+#include <output/charts/plot-chart.h>
+#include <output/charts/cartesian.h>
+#include <libpspp/compiler.h>
-/* Write the abscissa label */
-void
-chart_write_xlabel(struct chart *ch, const char *label)
+/* Start a new vector called NAME */
+void
+chart_vector_start (struct chart *ch, const char *name)
{
- if ( ! ch )
+ if ( ! ch )
return ;
- pl_savestate_r(ch->lp);
+ pl_savestate_r (ch->lp);
- pl_move_r(ch->lp,ch->data_left, ch->abscissa_top);
- pl_alabel_r(ch->lp,0,'t',label);
+ pl_colorname_r (ch->lp, data_colour [ch->n_datasets % N_CHART_COLOURS]);
- pl_restorestate_r(ch->lp);
+ ch->n_datasets++;
+ ch->dataset = xrealloc (ch->dataset, ch->n_datasets * sizeof (*ch->dataset));
+ ch->dataset[ch->n_datasets - 1] = strdup (name);
}
-
-
-/* Write the ordinate label */
-void
-chart_write_ylabel(struct chart *ch, const char *label)
+/* Plot a data point */
+void
+chart_datum (struct chart *ch, int dataset UNUSED, double x, double y)
{
- if ( ! ch )
+ if ( ! ch )
return ;
- pl_savestate_r(ch->lp);
+ {
+ const double x_pos =
+ (x - ch->x_min) * ch->abscissa_scale + ch->data_left ;
- pl_move_r(ch->lp, ch->data_bottom, ch->ordinate_right);
- pl_textangle_r(ch->lp, 90);
- pl_alabel_r(ch->lp, 0, 0, label);
+ const double y_pos =
+ (y - ch->y_min) * ch->ordinate_scale + ch->data_bottom ;
- pl_restorestate_r(ch->lp);
-}
+ pl_savestate_r(ch->lp);
+ pl_fmarker_r(ch->lp, x_pos, y_pos, 6, 15);
+ pl_restorestate_r(ch->lp);
+ }
+}
-static void
-write_legend(struct chart *chart, const char *heading,
- int n)
+void
+chart_vector_end (struct chart *ch)
{
- int ds;
-
- if ( ! chart )
- return ;
-
-
- pl_savestate_r(chart->lp);
-
- pl_filltype_r(chart->lp,1);
-
- pl_move_r(chart->lp, chart->legend_left,
- chart->data_bottom + chart->font_size * n * 1.5);
-
- pl_alabel_r(chart->lp,0,'b',heading);
-
- for (ds = 0 ; ds < n ; ++ds )
- {
- pl_fmove_r(chart->lp,
- chart->legend_left,
- chart->data_bottom + chart->font_size * ds * 1.5);
-
- pl_savestate_r(chart->lp);
- pl_fillcolorname_r(chart->lp,data_colour[ds]);
- pl_fboxrel_r (chart->lp,
- 0,0,
- chart->font_size, chart->font_size);
- pl_restorestate_r(chart->lp);
-
- pl_fmove_r(chart->lp,
- chart->legend_left + chart->font_size * 1.5,
- chart->data_bottom + chart->font_size * ds * 1.5);
-
- pl_alabel_r(chart->lp,'l','b',dataset[ds].label);
- }
-
-
- pl_restorestate_r(chart->lp);
+ pl_endpath_r (ch->lp);
+ pl_colorname_r (ch->lp, "black");
+ ch->in_path = false;
+ pl_restorestate_r (ch->lp);
}
-
/* Plot a data point */
void
-chart_datum(struct chart *ch, int dataset UNUSED, double x, double y)
+chart_vector (struct chart *ch, double x, double y)
{
- if ( ! ch )
+ if ( ! ch )
return ;
{
- const double x_pos =
- (x - ch->x_min) * ch->abscissa_scale + ch->data_left ;
+ const double x_pos =
+ (x - ch->x_min) * ch->abscissa_scale + ch->data_left ;
- const double y_pos =
+ const double y_pos =
(y - ch->y_min) * ch->ordinate_scale + ch->data_bottom ;
- pl_savestate_r(ch->lp);
-
- pl_fmarker_r(ch->lp, x_pos, y_pos, 6, 15);
-
- pl_restorestate_r(ch->lp);
+ if ( ch->in_path)
+ pl_fcont_r (ch->lp, x_pos, y_pos);
+ else
+ {
+ pl_fmove_r (ch->lp, x_pos, y_pos);
+ ch->in_path = true;
+ }
}
}
+
+
/* Draw a line with slope SLOPE and intercept INTERCEPT.
between the points limit1 and limit2.
- If lim_dim is CHART_DIM_Y then the limit{1,2} are on the
+ If lim_dim is CHART_DIM_Y then the limit{1,2} are on the
y axis otherwise the x axis
*/
void
-chart_line(struct chart *ch, double slope, double intercept,
+chart_line (struct chart *ch, double slope, double intercept,
double limit1, double limit2, enum CHART_DIM lim_dim)
{
double x1, y1;
double x2, y2 ;
- if ( ! ch )
+ if ( ! ch )
return ;
- if ( lim_dim == CHART_DIM_Y )
+ if ( lim_dim == CHART_DIM_Y )
{
x1 = ( limit1 - intercept ) / slope ;
x2 = ( limit2 - intercept ) / slope ;
x1 = (x1 - ch->x_min) * ch->abscissa_scale + ch->data_left ;
x2 = (x2 - ch->x_min) * ch->abscissa_scale + ch->data_left ;
- pl_savestate_r(ch->lp);
+ pl_savestate_r(ch->lp);
pl_fline_r(ch->lp, x1, y1, x2, y2);
- pl_restorestate_r(ch->lp);
-
+ pl_restorestate_r(ch->lp);
}
projects / pspp-builds.git / blobdiff