for (i = 0 ; i < 4 ; ++i)
{
PsppireAxisUniform *vaxis;
- casenumber n_cases = psppire_case_file_get_case_count (ds->case_file);
+ casenumber n_cases = psppire_data_store_get_case_count (ds);
g_object_get (de->data_sheet[i], "vertical-axis", &vaxis, NULL);
}
}
+/* Return the width (in pixels) of an upper case M when rendered in the
+ current font of W
+*/
+static gint
+width_of_m (GtkWidget *w)
+{
+ PangoRectangle rect;
+ PangoLayout *layout = gtk_widget_create_pango_layout (w, "M");
+
+ pango_layout_get_pixel_extents (layout, NULL, &rect);
+
+ g_object_unref (layout);
+
+ return rect.width;
+}
+
static void
new_variables_callback (PsppireDict *dict, gpointer data)
{
gint v, i;
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+ gint m_width = width_of_m (GTK_WIDGET (de));
PsppireAxisHetero *vaxis;
g_object_get (de->var_sheet, "vertical-axis", &vaxis, NULL);
{
const struct variable *var = psppire_dict_get_variable (dict, v);
- psppire_axis_hetero_append (haxis, 10 * var_get_display_width (var));
+ psppire_axis_hetero_append (haxis, m_width * var_get_display_width (var));
}
}
}
-/* Return the width (in pixels) of an upper case M when rendered in the
- current font of W
-*/
-static gint
-width_of_m (GtkWidget *w)
-{
- PangoRectangle rect;
- PangoLayout *layout = gtk_widget_create_pango_layout (w, "M");
-
- pango_layout_get_pixel_extents (layout, NULL, &rect);
-
- g_object_unref (layout);
-
- return rect.width;
-}
-
static void
insert_variable_callback (PsppireDict *dict, gint x, gpointer data)
{
{
struct ccase old;
- if (psppire_case_file_get_case (ds->case_file, i, &old))
+ if (psppire_data_store_get_case (ds, i, &old))
{
struct ccase new;