X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fchart.c;h=6f1ce034a3a47875ccb51228513ce22de72e2199;hb=f8dc847024749f595c17e7384c519c329a39070d;hp=489ef189f6d3817c047147ef8bcd206ec31cc56c;hpb=02118dddfe989ca4fda5db5b54d64b1a564b6674;p=pspp

diff --git a/src/output/chart.c b/src/output/chart.c
index 489ef189f6..6f1ce034a3 100644
--- a/src/output/chart.c
+++ b/src/output/chart.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 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
@@ -16,144 +16,94 @@
 
 #include <config.h>
 
-#include <output/chart.h>
-
 #include <assert.h>
-#include <errno.h>
-#include <float.h>
-#include <math.h>
-#include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-
-#include <plot.h>
 
-#include <libpspp/alloc.h>
-#include <libpspp/str.h>
-#include <output/manager.h>
-#include <output/output.h>
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
+#include "libpspp/str.h"
+#include "output/chart-provider.h"
+#include "output/output-item.h"
 
-#include "error.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-extern struct som_table_class tab_table_class;
-
 struct chart *
-chart_create(void)
+chart_ref (const struct chart *chart_)
 {
-  struct chart *chart;
-  struct outp_driver *d;
-
-  d = outp_drivers (NULL);
-  if (d == NULL)
-    return NULL;
-
-  chart = xmalloc (sizeof *chart);
-  chart->lp = NULL;
-  d->class->initialise_chart(d, chart);
-  if (!chart->lp)
-    {
-      free (chart);
-      return NULL;
-    }
-
-  if (pl_openpl_r (chart->lp) < 0)      /* open Plotter */
-    return NULL;
-
-  pl_fspace_r (chart->lp, 0.0, 0.0, 1000.0, 1000.0); /* set coordinate system */
-  pl_flinewidth_r (chart->lp, 0.25);    /* set line thickness */
-  pl_pencolorname_r (chart->lp, "black");
-
-  pl_erase_r (chart->lp);               /* erase graphics display */
-  pl_filltype_r(chart->lp,0);
-
-  pl_savestate_r(chart->lp);
-
-  /* Set default chartetry */
-  chart->data_top =   900;
-  chart->data_right = 800;
-  chart->data_bottom = 120;
-  chart->data_left = 150;
-  chart->abscissa_top = 70;
-  chart->ordinate_right = 120;
-  chart->title_bottom = 920;
-  chart->legend_left = 810;
-  chart->legend_right = 1000;
-  chart->font_size = 0;
-  strcpy(chart->fill_colour,"red");
-
-  /* Get default font size */
-  if ( !chart->font_size)
-    chart->font_size = pl_fontsize_r(chart->lp, -1);
-
-  /* Draw the data area */
-  pl_box_r(chart->lp,
-	   chart->data_left, chart->data_bottom,
-	   chart->data_right, chart->data_top);
-
+  struct chart *chart = CONST_CAST (struct chart *, chart_);
+  assert (chart->ref_cnt > 0);
+  chart->ref_cnt++;
   return chart;
 }
 
 void
-chart_submit(struct chart *chart)
+chart_unref (struct chart *chart)
 {
-  struct som_entity s;
-  struct outp_driver *d;
-
-  if ( ! chart )
-     return ;
-
-  pl_restorestate_r(chart->lp);
-
-  s.class = &tab_table_class;
-  s.ext = chart;
-  s.type = SOM_CHART;
-  som_submit (&s);
-
-  if (pl_closepl_r (chart->lp) < 0)     /* close Plotter */
+  if (chart)
     {
-      fprintf (stderr, "Couldn't close Plotter\n");
+      assert (chart->ref_cnt > 0);
+      if (!--chart->ref_cnt)
+        {
+          char *title = chart->title;
+          chart->class->destroy (chart);
+          free (title);
+        }
     }
+}
 
-  pl_deletepl_r(chart->lp);
+bool
+chart_is_shared (const struct chart *chart)
+{
+  assert (chart->ref_cnt > 0);
+  return chart->ref_cnt > 1;
+}
 
-  pl_deleteplparams(chart->pl_params);
+/* Initializes CHART as a chart of the specified CLASS.  The new chart
+   initially has the specified TITLE, which may be NULL if no title is yet
+   available.  The caller retains ownership of TITLE.
 
-  d = outp_drivers (NULL);
-  d->class->finalise_chart(d, chart);
-  free(chart);
+   A chart is abstract, that is, a plain chart is not useful on its own.  Thus,
+   this function is normally called from the initialization function of some
+   subclass of chart. */
+void
+chart_init (struct chart *chart, const struct chart_class *class,
+            const char *title)
+{
+  *chart = (struct chart) {
+    .ref_cnt = 1,
+    .class = class,
+    .title = xstrdup_if_nonnull (title),
+  };
 }
 
-void
-chart_init_separate (struct chart *ch, const char *type,
-                     const char *file_name_tmpl, int number)
+/* Returns CHART's title, which is a null pointer if no title has been set. */
+const char *
+chart_get_title (const struct chart *chart)
 {
-  FILE *fp;
-  int number_pos;
-
-  number_pos = strchr (file_name_tmpl, '#') - file_name_tmpl;
-  ch->file_name = xasprintf ("%.*s%d%s",
-                             number_pos, file_name_tmpl,
-                             number,
-                             file_name_tmpl + number_pos + 1);
-  fp = fopen (ch->file_name, "wb");
-  if (fp == NULL)
-    {
-      error (0, errno, _("creating \"%s\""), ch->file_name);
-      free (ch->file_name);
-      ch->file_name = NULL;
-      return;
-    }
+  return chart->title;
+}
 
-  ch->pl_params = pl_newplparams ();
-  ch->lp = pl_newpl_r (type, 0, fp, stderr, ch->pl_params);
+/* Sets CHART's title to TITLE, replacing any previous title.  Specify NULL for
+   TITLE to clear any title from CHART.  The caller retains ownership of
+   TITLE.
+
+   This function may only be used on a chart that is unshared. */
+void
+chart_set_title (struct chart *chart, const char *title)
+{
+  assert (!chart_is_shared (chart));
+  free (chart->title);
+  chart->title = xstrdup_if_nonnull (title);
 }
 
+/* Submits CHART to the configured output drivers, and transfers ownership to
+   the output subsystem. */
 void
-chart_finalise_separate (struct chart *ch)
+chart_submit (struct chart *chart)
 {
-  free (ch->file_name);
+  if (chart)
+    output_item_submit (chart_item_create (chart));
 }