refactoring

[pspp] / src / output / charts / scatterplot-cairo.c

diff --git a/src/output/charts/scatterplot-cairo.c b/src/output/charts/scatterplot-cairo.c
index 17307497c783f7b2c4d5bea00634170d955f05b9..a6a499b868c2144dce9145ca46958970858b1b32 100644 (file)
--- a/src/output/charts/scatterplot-cairo.c
+++ b/src/output/charts/scatterplot-cairo.c
@@ -72,7 +72,7 @@ xrchart_draw_scatterplot (const struct chart *chart, cairo_t *cr,
                {
                  struct string label;
                  ds_init_empty (&label);
-                 if (var_is_value_missing (spc->byvar,val,MV_ANY))
+                 if (var_is_value_missing (spc->byvar,val))
                    ds_put_cstr (&label,"missing");
                  else
                    var_append_value_name (spc->byvar,val,&label);
@@ -101,8 +101,8 @@ xrchart_draw_scatterplot (const struct chart *chart, cairo_t *cr,
                             colour->blue / 255.0);
 
       xrchart_datum (cr, geom, 0,
-                    case_data_idx (c, SP_IDX_X)->f,
-                    case_data_idx (c, SP_IDX_Y)->f);
+                    case_num_idx (c, SP_IDX_X),
+                    case_num_idx (c, SP_IDX_Y));
     }
   casereader_destroy (data);
   cairo_restore (cr);