X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo-chart.c;h=20488bb96e5bdc51b77efcb81235dc58e3251096;hb=8b416a04a5b9cf0d3f380dbd821d337267248759;hp=809da37c2a69a600e12dc0f6ea63ea7cd0944646;hpb=6fa20f2f419eac61340d9b93d5cdde01c281c9ec;p=pspp

diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c
index 809da37c2a..20488bb96e 100644
--- a/src/output/cairo-chart.c
+++ b/src/output/cairo-chart.c
@@ -34,8 +34,6 @@
 #include "libpspp/assertion.h"
 #include "libpspp/message.h"
 #include "math/chart-geometry.h"
-#include "output/cairo.h"
-#include "output/chart-item.h"
 #include "output/charts/barchart.h"
 #include "output/charts/boxplot.h"
 #include "output/charts/np-plot.h"
@@ -622,7 +620,7 @@ xrchart_line(cairo_t *cr, const struct xrchart_geometry *geom,
 }
 
 void
-xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr,
+xr_draw_chart (const struct chart *chart, cairo_t *cr,
                double width, double height)
 {
   struct xrchart_geometry geom;
@@ -631,24 +629,24 @@ xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr,
   cairo_translate (cr, 0, height);
   cairo_scale (cr, 1.0, -1.0);
   xrchart_geometry_init (cr, &geom, width, height);
-  if (is_boxplot (chart_item))
-    xrchart_draw_boxplot (chart_item, cr, &geom);
-  else if (is_histogram_chart (chart_item))
-    xrchart_draw_histogram (chart_item, cr, &geom);
-  else if (is_np_plot_chart (chart_item))
-    xrchart_draw_np_plot (chart_item, cr, &geom);
-  else if (is_piechart (chart_item))
-    xrchart_draw_piechart (chart_item, cr, &geom);
-  else if (is_barchart (chart_item))
-    xrchart_draw_barchart (chart_item, cr, &geom);
-  else if (is_roc_chart (chart_item))
-    xrchart_draw_roc (chart_item, cr, &geom);
-  else if (is_scree (chart_item))
-    xrchart_draw_scree (chart_item, cr, &geom);
-  else if (is_spreadlevel_plot_chart (chart_item))
-    xrchart_draw_spreadlevel (chart_item, cr, &geom);
-  else if (is_scatterplot_chart (chart_item))
-    xrchart_draw_scatterplot (chart_item, cr, &geom);
+  if (is_boxplot (chart))
+    xrchart_draw_boxplot (chart, cr, &geom);
+  else if (is_histogram_chart (chart))
+    xrchart_draw_histogram (chart, cr, &geom);
+  else if (is_np_plot_chart (chart))
+    xrchart_draw_np_plot (chart, cr, &geom);
+  else if (is_piechart (chart))
+    xrchart_draw_piechart (chart, cr, &geom);
+  else if (is_barchart (chart))
+    xrchart_draw_barchart (chart, cr, &geom);
+  else if (is_roc_chart (chart))
+    xrchart_draw_roc (chart, cr, &geom);
+  else if (is_scree (chart))
+    xrchart_draw_scree (chart, cr, &geom);
+  else if (is_spreadlevel_plot_chart (chart))
+    xrchart_draw_spreadlevel (chart, cr, &geom);
+  else if (is_scatterplot_chart (chart))
+    xrchart_draw_scatterplot (chart, cr, &geom);
   else
     NOT_REACHED ();
   xrchart_geometry_free (cr, &geom);
@@ -656,52 +654,64 @@ xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr,
   cairo_restore (cr);
 }
 
-char *
-xr_draw_png_chart (const struct chart_item *item,
-                   const char *file_name_template, int number,
-		   const struct cell_color *fg,
-		   const struct cell_color *bg)
+cairo_surface_t *
+xr_draw_image_chart (const struct chart *chart,
+                     const struct cell_color *fg,
+                     const struct cell_color *bg)
 {
   const int width = 640;
   const int length = 480;
 
-  cairo_surface_t *surface;
-  cairo_status_t status;
-  const char *number_pos;
-  char *file_name;
-  cairo_t *cr;
-
-  number_pos = strchr (file_name_template, '#');
-  if (number_pos != NULL)
-    file_name = xasprintf ("%.*s%d%s.png", (int) (number_pos - file_name_template),
-                           file_name_template, number, number_pos + 1);
-  else
-    file_name = xasprintf ("%s.png", file_name_template);
-
-  surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length);
-  cr = cairo_create (surface);
+  cairo_surface_t *surface = cairo_image_surface_create (
+    CAIRO_FORMAT_RGB24, width, length);
+  cairo_t *cr = cairo_create (surface);
 
   cairo_set_source_rgb (cr, bg->r / 255.0, bg->g / 255.0, bg->b / 255.0);
   cairo_paint (cr);
 
   cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0);
+  xr_draw_chart (chart, cr, width, length);
+
+  cairo_destroy (cr);
+
+  return surface;
+}
 
-  xr_draw_chart (item, cr, width, length);
+char *
+xr_write_png_image (cairo_surface_t *surface,
+                    const char *file_name_template, int number)
+{
+  const char *number_pos = strchr (file_name_template, '#');
+  char *file_name;
+  if (number_pos != NULL)
+    file_name = xasprintf ("%.*s%d%s.png",
+                           (int) (number_pos - file_name_template),
+                           file_name_template, number, number_pos + 1);
+  else
+    file_name = xasprintf ("%s.png", file_name_template);
 
-  status = cairo_surface_write_to_png (surface, file_name);
+  cairo_status_t status = cairo_surface_write_to_png (surface, file_name);
   if (status != CAIRO_STATUS_SUCCESS)
     msg (ME, _("error writing output file `%s': %s"),
            file_name, cairo_status_to_string (status));
 
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-
   return file_name;
 }
 
+char *
+xr_draw_png_chart (const struct chart *chart,
+                   const char *file_name_template, int number,
+		   const struct cell_color *fg,
+		   const struct cell_color *bg)
+{
+  cairo_surface_t *surface = xr_draw_image_chart (chart, fg, bg);
+  char *file_name = xr_write_png_image (surface, file_name_template, number);
+  cairo_surface_destroy (surface);
+  return file_name;
+}
 
 char *
-xr_draw_eps_chart (const struct chart_item *item,
+xr_draw_eps_chart (const struct chart *chart,
                    const char *file_name_template, int number,
 		   const struct cell_color *fg,
 		   const struct cell_color *bg)
@@ -730,7 +740,7 @@ xr_draw_eps_chart (const struct chart_item *item,
 
   cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0);
 
-  xr_draw_chart (item, cr, width, length);
+  xr_draw_chart (chart, cr, width, length);
 
   cairo_destroy (cr);
   cairo_surface_destroy (surface);