X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=9833fb496f8a0be6dd3145fc7bbb334fe46b341f;hb=a5097a183f00ab2d2dc538ba7094a4696e2fea04;hp=2059d75ad716e42439a616f671f9b3701d155960;hpb=38c2638eed90f33225870563c4be183097e4155a;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 2059d75a..9833fb49 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2006, 2008 Free Software Foundation + Copyright (C) 2006, 2008, 2009 Free Software Foundation 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 @@ -25,12 +25,13 @@ #include #include -#include -#include +#include +#include #include #include "psppire-data-store.h" +#include #include "helper.h" #include @@ -48,12 +49,12 @@ static void psppire_data_store_init (PsppireDataStore *data_store); static void psppire_data_store_class_init (PsppireDataStoreClass *class); -static void psppire_data_store_sheet_model_init (GSheetModelIface *iface); +static void psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface); static void psppire_data_store_finalize (GObject *object); static void psppire_data_store_dispose (GObject *object); -static gboolean psppire_data_store_clear_datum (GSheetModel *model, +static gboolean psppire_data_store_clear_datum (PsppireSheetModel *model, glong row, glong column); @@ -117,7 +118,7 @@ psppire_data_store_get_type (void) &data_store_info, 0); g_type_add_interface_static (data_store_type, - G_TYPE_SHEET_MODEL, + PSPPIRE_TYPE_SHEET_MODEL, &sheet_model_info); } @@ -186,24 +187,24 @@ psppire_data_store_class_init (PsppireDataStoreClass *class) static gboolean -psppire_data_store_insert_values (PsppireDataStore *ds, - gint n_values, gint where); +psppire_data_store_insert_value (PsppireDataStore *ds, + gint width, gint where); -static union value * +static bool psppire_data_store_get_value (const PsppireDataStore *ds, casenumber casenum, size_t idx, - union value *value, int width); + union value *value); static gboolean psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, - gint idx, union value *v, gint width); + gint idx, union value *v); static glong -psppire_data_store_get_var_count (const GSheetModel *model) +psppire_data_store_get_var_count (const PsppireSheetModel *model) { const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); @@ -213,7 +214,7 @@ psppire_data_store_get_var_count (const GSheetModel *model) casenumber psppire_data_store_get_case_count (const PsppireDataStore *store) { - return datasheet_get_row_cnt (store->datasheet); + return datasheet_get_n_rows (store->datasheet); } size_t @@ -222,8 +223,14 @@ psppire_data_store_get_value_count (const PsppireDataStore *store) return psppire_dict_get_value_cnt (store->dict); } +const struct caseproto * +psppire_data_store_get_proto (const PsppireDataStore *store) +{ + return psppire_dict_get_proto (store->dict); +} + static casenumber -psppire_data_store_get_case_count_wrapper (const GSheetModel *model) +psppire_data_store_get_case_count_wrapper (const PsppireSheetModel *model) { const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); return psppire_data_store_get_case_count (store); @@ -238,7 +245,7 @@ psppire_data_store_init (PsppireDataStore *data_store) } static inline gchar * -psppire_data_store_get_string_wrapper (const GSheetModel *model, glong row, +psppire_data_store_get_string_wrapper (const PsppireSheetModel *model, glong row, glong column) { return psppire_data_store_get_string (PSPPIRE_DATA_STORE (model), row, column); @@ -246,7 +253,7 @@ psppire_data_store_get_string_wrapper (const GSheetModel *model, glong row, static inline gboolean -psppire_data_store_set_string_wrapper (GSheetModel *model, +psppire_data_store_set_string_wrapper (PsppireSheetModel *model, const gchar *text, glong row, glong column) { @@ -256,17 +263,18 @@ psppire_data_store_set_string_wrapper (GSheetModel *model, -static gchar * get_column_subtitle (const GSheetModel *model, gint col); -static gchar * get_column_button_label (const GSheetModel *model, gint col); -static gboolean get_column_sensitivity (const GSheetModel *model, gint col); -static GtkJustification get_column_justification (const GSheetModel *model, gint col); +static gchar * get_column_subtitle (const PsppireSheetModel *model, gint col); +static gchar * get_column_button_label (const PsppireSheetModel *model, gint col); +static gboolean get_column_sensitivity (const PsppireSheetModel *model, gint col); +static GtkJustification get_column_justification (const PsppireSheetModel *model, gint col); -static gchar * get_row_button_label (const GSheetModel *model, gint row); -static gboolean get_row_sensitivity (const GSheetModel *model, gint row); +static gchar * get_row_button_label (const PsppireSheetModel *model, gint row); +static gboolean get_row_sensitivity (const PsppireSheetModel *model, gint row); +static gboolean get_row_overstrike (const PsppireSheetModel *model, gint row); static void -psppire_data_store_sheet_model_init (GSheetModelIface *iface) +psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface) { iface->free_strings = TRUE; iface->get_string = psppire_data_store_get_string_wrapper; @@ -285,6 +293,7 @@ psppire_data_store_sheet_model_init (GSheetModelIface *iface) iface->get_row_title = get_row_button_label; iface->get_row_sensitivity = get_row_sensitivity; + iface->get_row_overstrike = get_row_overstrike; } @@ -293,34 +302,33 @@ psppire_data_store_sheet_model_init (GSheetModelIface *iface) */ static void delete_variable_callback (GObject *obj, gint dict_index, - gint case_index, gint val_cnt, + gint case_index, gint width, gpointer data) { PsppireDataStore *store = PSPPIRE_DATA_STORE (data); - g_sheet_model_columns_deleted (G_SHEET_MODEL (store), dict_index, 1); + psppire_sheet_model_columns_deleted (PSPPIRE_SHEET_MODEL (store), dict_index, 1); + datasheet_delete_columns (store->datasheet, case_index, 1); + datasheet_insert_column (store->datasheet, NULL, -1, case_index); #if AXIS_TRANSITION - g_sheet_column_columns_changed (G_SHEET_COLUMN (store), + psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store), dict_index, -1); #endif } - - static void variable_changed_callback (GObject *obj, gint var_num, gpointer data) { +#if AXIS_TRANSITION PsppireDataStore *store = PSPPIRE_DATA_STORE (data); -#if AXIS_TRANSITION - g_sheet_column_columns_changed (G_SHEET_COLUMN (store), + psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store), var_num, 1); - - g_sheet_model_range_changed (G_SHEET_MODEL (store), + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), -1, var_num, -1, var_num); #endif @@ -329,6 +337,7 @@ variable_changed_callback (GObject *obj, gint var_num, gpointer data) static void insert_variable_callback (GObject *obj, gint var_num, gpointer data) { + struct variable *variable; PsppireDataStore *store; gint posn; @@ -336,46 +345,64 @@ insert_variable_callback (GObject *obj, gint var_num, gpointer data) store = PSPPIRE_DATA_STORE (data); - if ( var_num > 0 ) - { - struct variable *variable = - psppire_dict_get_variable (store->dict, var_num); - - g_assert (variable != NULL); - - posn = var_get_case_index (variable); - } - else - { - posn = 0; - } - - psppire_data_store_insert_values (store, 1, posn); + variable = psppire_dict_get_variable (store->dict, var_num); + posn = var_get_case_index (variable); + psppire_data_store_insert_value (store, var_get_width (variable), posn); #if AXIS_TRANSITION - g_sheet_column_columns_changed (G_SHEET_COLUMN (store), + psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store), var_num, 1); #endif - g_sheet_model_columns_inserted (G_SHEET_MODEL (store), var_num, 1); + psppire_sheet_model_columns_inserted (PSPPIRE_SHEET_MODEL (store), var_num, 1); } +struct resize_datum_aux + { + int old_width; + int new_width; + }; + + +void +resize_datum (const union value *old, union value *new, void *aux_) +{ + struct resize_datum_aux *aux = aux_; + + if (aux->new_width == 0) + { + /* FIXME: try to parse string as number. */ + new->f = SYSMIS; + } + else if (aux->old_width == 0) + { + /* FIXME: format number as string. */ + value_set_missing (new, aux->new_width); + } + else + value_copy_rpad (new, aux->new_width, old, aux->old_width, ' '); +} static void dict_size_change_callback (GObject *obj, - gint posn, gint adjustment, gpointer data) + gint var_num, gint old_width, gpointer data) { PsppireDataStore *store = PSPPIRE_DATA_STORE (data); + struct variable *variable; + int posn; - const struct variable *v = psppire_dict_get_variable (store->dict, posn); + variable = psppire_dict_get_variable (store->dict, var_num); + posn = var_get_case_index (variable); - const gint new_val_width = value_cnt_from_width (var_get_width (v)); - - if ( adjustment > 0 ) - psppire_data_store_insert_values (store, adjustment, - new_val_width - adjustment + - var_get_case_index(v)); + if (old_width != var_get_width (variable)) + { + struct resize_datum_aux aux; + aux.old_width = old_width; + aux.new_width = var_get_width (variable); + datasheet_resize_column (store->datasheet, posn, aux.new_width, + resize_datum, &aux); + } } @@ -410,7 +437,7 @@ psppire_data_store_set_reader (PsppireDataStore *ds, ds->datasheet = datasheet_create (reader); - g_sheet_model_range_changed (G_SHEET_MODEL (ds), + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (ds), -1, -1, -1, -1); if ( ds->dict ) @@ -477,10 +504,10 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di /* The entire model has changed */ - g_sheet_model_range_changed (G_SHEET_MODEL (data_store), -1, -1, -1, -1); + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (data_store), -1, -1, -1, -1); #if AXIS_TRANSITION - g_sheet_column_columns_changed (G_SHEET_COLUMN (data_store), 0, -1); + psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (data_store), 0, -1); #endif if ( data_store->dict ) @@ -530,32 +557,20 @@ gboolean psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn) { gboolean result; - gint val_cnt, v; - struct ccase cc; + const struct caseproto *proto; + struct ccase *cc; g_return_val_if_fail (ds, FALSE); - val_cnt = datasheet_get_column_cnt (ds->datasheet) ; - - g_return_val_if_fail (val_cnt > 0, FALSE); - + proto = datasheet_get_proto (ds->datasheet); + g_return_val_if_fail (caseproto_get_n_widths (proto) > 0, FALSE); g_return_val_if_fail (posn <= psppire_data_store_get_case_count (ds), FALSE); - case_create (&cc, val_cnt); + cc = case_create (proto); + case_set_missing (cc); - memset ( case_data_rw_idx (&cc, 0), 0, val_cnt * MAX_SHORT_STRING); + result = psppire_data_store_insert_case (ds, cc, posn); - for (v = 0 ; v < psppire_dict_get_var_cnt (ds->dict) ; ++v) - { - const struct variable *pv = psppire_dict_get_variable (ds->dict, v); - if ( var_is_alpha (pv)) - continue; - - case_data_rw (&cc, pv)->f = SYSMIS; - } - - result = psppire_data_store_insert_case (ds, &cc, posn); - - case_destroy (&cc); + case_unref (cc); return result; } @@ -568,12 +583,15 @@ psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column) char *text; const struct fmt_spec *fp ; const struct variable *pv ; - union value *v ; - GString *s; + const struct dictionary *dict; + union value v; + int width; g_return_val_if_fail (store->dict, NULL); g_return_val_if_fail (store->datasheet, NULL); + dict = store->dict->dict; + if (column >= psppire_dict_get_var_cnt (store->dict)) return NULL; @@ -585,68 +603,54 @@ psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column) g_assert (pv); idx = var_get_case_index (pv); + width = var_get_width (pv); g_assert (idx >= 0); - v = psppire_data_store_get_value (store, row, idx, NULL, - var_get_width (pv)); - - g_return_val_if_fail (v, NULL); + value_init (&v, width); + if (!psppire_data_store_get_value (store, row, idx, &v)) + return NULL; if ( store->show_labels) { - const gchar *label = var_lookup_value_label (pv, v); + const gchar *label = var_lookup_value_label (pv, &v); if (label) { - free (v); - return pspp_locale_to_utf8 (label, -1, 0); + value_destroy (&v, width); + return g_strdup (label); } } fp = var_get_write_format (pv); - s = g_string_sized_new (fp->w + 1); - g_string_set_size (s, fp->w); - - memset (s->str, 0, fp->w); - - g_assert (fp->w == s->len); - - /* Converts binary value V into printable form in the exactly - FP->W character in buffer S according to format specification - FP. No null terminator is appended to the buffer. */ - data_out (v, fp, s->str); - - text = pspp_locale_to_utf8 (s->str, fp->w, 0); - g_string_free (s, TRUE); + text = data_out (&v, dict_get_encoding (dict), fp); g_strchomp (text); - free (v); + value_destroy (&v, width); return text; } static gboolean -psppire_data_store_clear_datum (GSheetModel *model, +psppire_data_store_clear_datum (PsppireSheetModel *model, glong row, glong col) { PsppireDataStore *store = PSPPIRE_DATA_STORE (model); union value v; const struct variable *pv = psppire_dict_get_variable (store->dict, col); + int width = var_get_width (pv); const gint index = var_get_case_index (pv) ; - if ( var_is_numeric (pv)) - v.f = SYSMIS; - else - memcpy (v.s, "", MAX_SHORT_STRING); + value_init (&v, width); + value_set_missing (&v, width); + psppire_data_store_set_value (store, row, index, &v); + value_destroy (&v, width); - psppire_data_store_set_value (store, row, index, &v, - var_get_width (pv)); + psppire_sheet_model_range_changed (model, row, col, row, col); - g_sheet_model_range_changed (model, row, col, row, col); return TRUE; } @@ -662,7 +666,8 @@ psppire_data_store_set_string (PsppireDataStore *store, { glong n_cases; const struct variable *pv = psppire_dict_get_variable (store->dict, col); - g_return_val_if_fail (pv, FALSE); + if ( NULL == pv) + return FALSE; n_cases = psppire_data_store_get_case_count (store); @@ -676,7 +681,7 @@ psppire_data_store_set_string (PsppireDataStore *store, var_get_case_index (pv), ss_cstr (text), var_get_write_format (pv)); - g_sheet_model_range_changed (G_SHEET_MODEL (store), row, col, row, col); + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, col); return TRUE; } @@ -691,7 +696,7 @@ psppire_data_store_show_labels (PsppireDataStore *store, gboolean show_labels) store->show_labels = show_labels; - g_sheet_model_range_changed (G_SHEET_MODEL (store), + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), -1, -1, -1, -1); } @@ -743,20 +748,16 @@ static const gchar null_var_name[]=N_("var"); /* Row related funcs */ static gchar * -get_row_button_label (const GSheetModel *model, gint unit) +get_row_button_label (const PsppireSheetModel *model, gint unit) { - gchar *s = g_strdup_printf (_("%d"), unit + FIRST_CASE_NUMBER); - - gchar *text = pspp_locale_to_utf8 (s, -1, 0); + // PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - g_free (s); - - return text; + return g_strdup_printf (_("%d"), unit + FIRST_CASE_NUMBER); } static gboolean -get_row_sensitivity (const GSheetModel *model, gint unit) +get_row_sensitivity (const PsppireSheetModel *model, gint unit) { PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); @@ -769,9 +770,8 @@ get_row_sensitivity (const GSheetModel *model, gint unit) /* Column related stuff */ static gchar * -get_column_subtitle (const GSheetModel *model, gint col) +get_column_subtitle (const PsppireSheetModel *model, gint col) { - gchar *text; const struct variable *v ; PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); @@ -783,15 +783,12 @@ get_column_subtitle (const GSheetModel *model, gint col) if ( ! var_has_label (v)) return NULL; - text = pspp_locale_to_utf8 (var_get_label (v), -1, 0); - - return text; + return xstrdup (var_get_label (v)); } static gchar * -get_column_button_label (const GSheetModel *model, gint col) +get_column_button_label (const PsppireSheetModel *model, gint col) { - gchar *text; struct variable *pv ; PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); @@ -800,13 +797,14 @@ get_column_button_label (const GSheetModel *model, gint col) pv = psppire_dict_get_variable (ds->dict, col); - text = pspp_locale_to_utf8 (var_get_name (pv), -1, 0); + if (NULL == pv) + return NULL; - return text; + return xstrdup (var_get_name (pv)); } static gboolean -get_column_sensitivity (const GSheetModel *model, gint col) +get_column_sensitivity (const PsppireSheetModel *model, gint col) { PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); @@ -816,7 +814,7 @@ get_column_sensitivity (const GSheetModel *model, gint col) static GtkJustification -get_column_justification (const GSheetModel *model, gint col) +get_column_justification (const PsppireSheetModel *model, gint col) { PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); const struct variable *pv ; @@ -836,18 +834,16 @@ get_column_justification (const GSheetModel *model, gint col) -/* Fills C with the CASENUMth case. - Returns true on success, false otherwise. +/* Returns the CASENUMth case, or a null pointer on failure. */ -gboolean +struct ccase * psppire_data_store_get_case (const PsppireDataStore *ds, - casenumber casenum, - struct ccase *c) + casenumber casenum) { g_return_val_if_fail (ds, FALSE); g_return_val_if_fail (ds->datasheet, FALSE); - return datasheet_get_row (ds->datasheet, casenum, c); + return datasheet_get_row (ds->datasheet, casenum); } @@ -865,7 +861,7 @@ psppire_data_store_delete_cases (PsppireDataStore *ds, casenumber first, datasheet_delete_rows (ds->datasheet, first, n_cases); g_signal_emit (ds, signals [CASES_DELETED], 0, first, n_cases); - g_sheet_model_rows_deleted (G_SHEET_MODEL (ds), first, n_cases); + psppire_sheet_model_rows_deleted (PSPPIRE_SHEET_MODEL (ds), first, n_cases); return TRUE; } @@ -878,19 +874,18 @@ psppire_data_store_insert_case (PsppireDataStore *ds, struct ccase *cc, casenumber posn) { - struct ccase tmp; bool result ; g_return_val_if_fail (ds, FALSE); g_return_val_if_fail (ds->datasheet, FALSE); - case_clone (&tmp, cc); - result = datasheet_insert_rows (ds->datasheet, posn, &tmp, 1); + case_ref (cc); + result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1); if ( result ) { g_signal_emit (ds, signals [CASE_INSERTED], 0, posn); - g_sheet_model_rows_inserted (G_SHEET_MODEL (ds), posn, 1); + psppire_sheet_model_rows_inserted (PSPPIRE_SHEET_MODEL (ds), posn, 1); } else g_warning ("Cannot insert case at position %ld\n", posn); @@ -899,53 +894,38 @@ psppire_data_store_insert_case (PsppireDataStore *ds, } -/* Copies the IDXth value from case CASENUM into VALUE. - If VALUE is null, then memory is allocated is allocated with - malloc. Returns the value if successful, NULL on failure. */ -static union value * +/* Copies the IDXth value from case CASENUM into VALUE, which + must be of the correct width for IDX. + Returns true if successful, false on failure. */ +static bool psppire_data_store_get_value (const PsppireDataStore *ds, casenumber casenum, size_t idx, - union value *value, int width) + union value *value) { - bool allocated; - g_return_val_if_fail (ds, false); g_return_val_if_fail (ds->datasheet, false); + g_return_val_if_fail (idx < datasheet_get_n_columns (ds->datasheet), false); - g_return_val_if_fail (idx < datasheet_get_column_cnt (ds->datasheet), false); - - if (value == NULL) - { - value = xnmalloc (value_cnt_from_width (width), sizeof *value); - allocated = true; - } - else - allocated = false; - if (!datasheet_get_value (ds->datasheet, casenum, idx, value, width)) - { - if (allocated) - free (value); - value = NULL; - } - return value; + return datasheet_get_value (ds->datasheet, casenum, idx, value); } /* Set the IDXth value of case C to V. + V must be the correct width for IDX. Returns true if successful, false on I/O error. */ static gboolean psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, - gint idx, union value *v, gint width) + gint idx, union value *v) { bool ok; g_return_val_if_fail (ds, FALSE); g_return_val_if_fail (ds->datasheet, FALSE); - g_return_val_if_fail (idx < datasheet_get_column_cnt (ds->datasheet), FALSE); + g_return_val_if_fail (idx < datasheet_get_n_columns (ds->datasheet), FALSE); - ok = datasheet_put_value (ds->datasheet, casenum, idx, v, width); + ok = datasheet_put_value (ds->datasheet, casenum, idx, v); if (ok) g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum); @@ -960,22 +940,29 @@ static gboolean psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx, struct substring input, const struct fmt_spec *fmt) { - union value *value = NULL; + union value value; int width; bool ok; + PsppireDict *dict; + g_return_val_if_fail (ds, FALSE); g_return_val_if_fail (ds->datasheet, FALSE); - g_return_val_if_fail (idx < datasheet_get_column_cnt (ds->datasheet), FALSE); + g_return_val_if_fail (idx < datasheet_get_n_columns (ds->datasheet), FALSE); - width = fmt_var_width (fmt); - value = xmalloca (value_cnt_from_width (width) * sizeof *value); - ok = (datasheet_get_value (ds->datasheet, casenum, idx, value, width) - && data_in (input, LEGACY_NATIVE, fmt->type, 0, 0, 0, value, width) - && datasheet_put_value (ds->datasheet, casenum, idx, value, width)); + dict = ds->dict; - freea (value); + width = fmt_var_width (fmt); + g_return_val_if_fail (caseproto_get_width ( + datasheet_get_proto (ds->datasheet), idx) == width, + FALSE); + value_init (&value, width); + ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value) + && data_in (input, UTF8, fmt->type, 0, 0, 0, + dict->dict, &value, width) + && datasheet_put_value (ds->datasheet, casenum, idx, &value)); + value_destroy (&value, width); if (ok) g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum); @@ -983,28 +970,58 @@ psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx, return ok; } -/* Resize the cases in the casefile, by inserting N_VALUES into every - one of them at the position immediately preceeding WHERE. +/* Resize the cases in the casefile, by inserting a value of the + given WIDTH into every one of them at the position immediately + preceding WHERE. */ static gboolean -psppire_data_store_insert_values (PsppireDataStore *ds, - gint n_values, gint where) +psppire_data_store_insert_value (PsppireDataStore *ds, + gint width, gint where) { - g_return_val_if_fail (ds, FALSE); + union value value; - if ( n_values == 0 ) - return FALSE; + g_return_val_if_fail (ds, FALSE); - g_assert (n_values > 0); + g_assert (width >= 0); if ( ! ds->datasheet ) ds->datasheet = datasheet_create (NULL); - { - union value *values = xcalloc (n_values, sizeof *values); - datasheet_insert_columns (ds->datasheet, values, n_values, where); - free (values); - } + value_init (&value, width); + if (width == 0) + value.f = 0; + else + value_set_missing (&value, width); + + datasheet_insert_column (ds->datasheet, &value, width, where); return TRUE; } + +static gboolean +get_row_overstrike (const PsppireSheetModel *model, gint row) +{ + union value val; + PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); + + const struct dictionary *dict = ds->dict->dict; + + const struct variable *filter = dict_get_filter (dict); + + if ( row < 0 || row >= datasheet_get_n_rows (ds->datasheet)) + return FALSE; + + if ( ! filter) + return FALSE; + + g_assert (var_is_numeric (filter)); + + value_init (&val, 0); + if ( ! datasheet_get_value (ds->datasheet, row, + var_get_case_index (filter), + &val) ) + return FALSE; + + + return (val.f == 0.0); +}