X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=1441afa56a1cee57b645aa2c233d3c37ea77525b;hb=aa6f8e301fab021ba2fea720a162e506612ba29f;hp=9835d307fb80eafc3361d062e72b121f77fc7d89;hpb=11706f97dd318697e43e6468b130ca5b7f1bff87;p=pspp diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 9835d307fb..1441afa56a 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, 2010, 2011, 2012, 2013 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,13 +25,12 @@ #include #include -#include -#include +#include #include #include "psppire-data-store.h" -#include "psppire-case-file.h" +#include #include "helper.h" #include @@ -40,30 +39,127 @@ #include #include +#include + +#include "xalloc.h" +#include "xmalloca.h" + + 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_row_init (GSheetRowIface *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, - glong row, glong column); +static gboolean psppire_data_store_insert_case (PsppireDataStore *ds, + struct ccase *cc, + casenumber posn); -#define MIN_COLUMNS 10 -#define TRAILING_ROWS 10 +static gboolean psppire_data_store_data_in (PsppireDataStore *ds, + casenumber casenum, gint idx, + struct substring input, + const struct fmt_spec *fmt); static GObjectClass *parent_class = NULL; -enum {FONT_CHANGED, - n_SIGNALS}; +enum + { + BACKEND_CHANGED, + CASES_DELETED, + CASE_INSERTED, + CASE_CHANGED, + n_SIGNALS + }; static guint signals [n_SIGNALS]; +static gint +__tree_model_iter_n_children (GtkTreeModel *tree_model, + GtkTreeIter *iter) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); + + gint n = datasheet_get_n_rows (store->datasheet); + + return n; +} + + +static gint +__tree_model_get_n_columns (GtkTreeModel *tree_model) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); + + return psppire_dict_get_value_cnt (store->dict); +} + + +static gboolean +__iter_nth_child (GtkTreeModel *tree_model, + GtkTreeIter *iter, + GtkTreeIter *parent, + gint n) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); + + g_assert (parent == NULL); + + g_return_val_if_fail (store, FALSE); + g_return_val_if_fail (store->datasheet, FALSE); + + if (n >= datasheet_get_n_rows (store->datasheet)) + { + iter->stamp = -1; + iter->user_data = NULL; + return FALSE; + } + + iter->user_data = n; + return TRUE; +} + + + +static void +__get_value (GtkTreeModel *tree_model, + GtkTreeIter *iter, + gint column, + GValue *value) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); + + g_value_init (value, G_TYPE_DOUBLE); + + gint row = GPOINTER_TO_INT (iter->user_data); + + struct ccase *cc = datasheet_get_row (store->datasheet, row); + + g_value_set_double (value, case_data_idx (cc, column)->f); + case_unref (cc); +} + + +static void +__tree_model_init (GtkTreeModelIface *iface) +{ + iface->get_flags = NULL; + iface->get_n_columns = __tree_model_get_n_columns ; + iface->get_column_type = NULL; + iface->get_iter = NULL; + iface->iter_next = NULL; + iface->get_path = NULL; + iface->get_value = __get_value; + + iface->iter_children = NULL; + iface->iter_has_child = NULL; + iface->iter_n_children = __tree_model_iter_n_children; + iface->iter_nth_child = __iter_nth_child; + iface->iter_parent = NULL; +} + GType psppire_data_store_get_type (void) @@ -85,31 +181,18 @@ psppire_data_store_get_type (void) (GInstanceInitFunc) psppire_data_store_init, }; - static const GInterfaceInfo sheet_model_info = - { - (GInterfaceInitFunc) psppire_data_store_sheet_model_init, - NULL, - NULL - }; - - static const GInterfaceInfo sheet_row_info = - { - (GInterfaceInitFunc) psppire_data_store_sheet_row_init, + static const GInterfaceInfo tree_model_info = { + (GInterfaceInitFunc) __tree_model_init, NULL, NULL }; - - data_store_type = g_type_register_static (G_TYPE_OBJECT, "PsppireDataStore", + data_store_type = g_type_register_static (G_TYPE_OBJECT, + "PsppireDataStore", &data_store_info, 0); - g_type_add_interface_static (data_store_type, - G_TYPE_SHEET_MODEL, - &sheet_model_info); - - g_type_add_interface_static (data_store_type, - G_TYPE_SHEET_ROW, - &sheet_row_info); + g_type_add_interface_static (data_store_type, GTK_TYPE_TREE_MODEL, + &tree_model_info); } return data_store_type; @@ -127,8 +210,8 @@ psppire_data_store_class_init (PsppireDataStoreClass *class) object_class->finalize = psppire_data_store_finalize; object_class->dispose = psppire_data_store_dispose; - signals [FONT_CHANGED] = - g_signal_new ("font_changed", + signals [BACKEND_CHANGED] = + g_signal_new ("backend-changed", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, @@ -136,22 +219,53 @@ psppire_data_store_class_init (PsppireDataStoreClass *class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -} + signals [CASE_INSERTED] = + g_signal_new ("case-inserted", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, + 1, + G_TYPE_INT); -static glong -psppire_data_store_get_var_count (const GSheetModel *model) -{ - const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + signals [CASE_CHANGED] = + g_signal_new ("case-changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, + 1, + G_TYPE_INT); - return psppire_dict_get_var_cnt (store->dict); + signals [CASES_DELETED] = + g_signal_new ("cases-deleted", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + psppire_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, + G_TYPE_INT, + G_TYPE_INT); } + + +static gboolean +psppire_data_store_insert_value (PsppireDataStore *ds, + gint width, gint where); + casenumber psppire_data_store_get_case_count (const PsppireDataStore *store) { - return psppire_case_file_get_case_count (store->case_file); + return datasheet_get_n_rows (store->datasheet); } size_t @@ -160,214 +274,93 @@ psppire_data_store_get_value_count (const PsppireDataStore *store) return psppire_dict_get_value_cnt (store->dict); } -casenumber -psppire_data_store_get_case_count_wrapper (const GSheetModel *model) +const struct caseproto * +psppire_data_store_get_proto (const PsppireDataStore *store) { - const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - return psppire_data_store_get_case_count (store); + return psppire_dict_get_proto (store->dict); } static void psppire_data_store_init (PsppireDataStore *data_store) { - data_store->dict = 0; - data_store->case_file = NULL; - data_store->width_of_m = 10; + data_store->dict = NULL; + data_store->datasheet = NULL; data_store->dispose_has_run = FALSE; } -const PangoFontDescription * -psppire_data_store_get_font_desc (const GSheetModel *model, - glong row, glong column) -{ - PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - - return store->font_desc; -} - -static inline gchar * -psppire_data_store_get_string_wrapper (const GSheetModel *model, glong row, - glong column) -{ - return psppire_data_store_get_string (PSPPIRE_DATA_STORE (model), row, column); -} - - -static inline gboolean -psppire_data_store_set_string_wrapper (GSheetModel *model, - const gchar *text, - glong row, glong column) -{ - return psppire_data_store_set_string (PSPPIRE_DATA_STORE (model), text, - row, column); -} - - - -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 void -psppire_data_store_sheet_model_init (GSheetModelIface *iface) -{ - iface->free_strings = TRUE; - iface->get_string = psppire_data_store_get_string_wrapper; - iface->set_string = psppire_data_store_set_string_wrapper; - iface->clear_datum = psppire_data_store_clear_datum; - iface->is_editable = NULL; - iface->is_visible = NULL; - iface->get_foreground = NULL; - iface->get_background = NULL; - iface->get_font_desc = psppire_data_store_get_font_desc; - iface->get_cell_border = NULL; - iface->get_column_count = psppire_data_store_get_var_count; - iface->get_row_count = psppire_data_store_get_case_count_wrapper; - - iface->get_column_subtitle = get_column_subtitle; - iface->get_column_title = get_column_button_label; - iface->get_column_sensitivity = get_column_sensitivity; - iface->get_column_justification = get_column_justification; -} - -static void -delete_cases_callback (GtkWidget *w, - casenumber first, casenumber n_cases, gpointer data) -{ - PsppireDataStore *store ; - - g_return_if_fail (data); - - store = PSPPIRE_DATA_STORE (data); - - g_assert (first >= 0); - - g_sheet_model_rows_deleted (G_SHEET_MODEL (store), first, n_cases); -} - - -static void -insert_case_callback (GtkWidget *w, casenumber casenum, gpointer data) -{ - PsppireDataStore *store ; - - g_return_if_fail (data); - - store = PSPPIRE_DATA_STORE (data); - - g_sheet_model_range_changed (G_SHEET_MODEL (store), - casenum, -1, - psppire_case_file_get_case_count (store->case_file), - -1); - - g_sheet_model_rows_inserted (G_SHEET_MODEL (store), casenum, 1); -} - - -static void -changed_case_callback (GtkWidget *w, gint casenum, gpointer data) -{ - PsppireDataStore *store ; - g_return_if_fail (data); - - store = PSPPIRE_DATA_STORE (data); - - g_sheet_model_range_changed (G_SHEET_MODEL (store), - casenum, -1, - casenum, -1); -} - - /* A callback which occurs after a variable has been deleted. */ static void -delete_variable_callback (GObject *obj, gint dict_index, - gint case_index, gint val_cnt, - gpointer data) +delete_variable_callback (GObject *obj, const struct variable *var UNUSED, + gint dict_index, gint case_index, + gpointer data) { PsppireDataStore *store = PSPPIRE_DATA_STORE (data); -#if AXIS_TRANSITION - g_sheet_model_columns_deleted (G_SHEET_MODEL (store), dict_index, 1); + g_return_if_fail (store->datasheet); - g_sheet_column_columns_changed (G_SHEET_COLUMN (store), - dict_index, -1); -#endif + datasheet_delete_columns (store->datasheet, case_index, 1); + datasheet_insert_column (store->datasheet, NULL, -1, case_index); } +struct resize_datum_aux + { + const struct dictionary *dict; + const struct variable *new_variable; + const struct variable *old_variable; + }; static void -variable_changed_callback (GObject *obj, gint var_num, gpointer data) +resize_datum (const union value *old, union value *new, const void *aux_) { - PsppireDataStore *store = PSPPIRE_DATA_STORE (data); - -#if AXIS_TRANSITION - g_sheet_column_columns_changed (G_SHEET_COLUMN (store), - var_num, 1); - - - g_sheet_model_range_changed (G_SHEET_MODEL (store), - -1, var_num, - -1, var_num); -#endif + const struct resize_datum_aux *aux = aux_; + int new_width = var_get_width (aux->new_variable); + const char *enc = dict_get_encoding (aux->dict); + const struct fmt_spec *newfmt = var_get_print_format (aux->new_variable); + char *s = data_out (old, enc, var_get_print_format (aux->old_variable)); + enum fmt_type type = (fmt_usable_for_input (newfmt->type) + ? newfmt->type + : FMT_DOLLAR); + free (data_in (ss_cstr (s), enc, type, new, new_width, enc)); + free (s); } static void -insert_variable_callback (GObject *obj, gint var_num, gpointer data) +variable_changed_callback (GObject *obj, gint var_num, guint what, const struct variable *oldvar, + gpointer data) { - PsppireDataStore *store; - gint posn; - - g_return_if_fail (data); - - store = PSPPIRE_DATA_STORE (data); + PsppireDataStore *store = PSPPIRE_DATA_STORE (data); + struct variable *variable = psppire_dict_get_variable (store->dict, var_num); - if ( var_num > 0 ) + if (what & VAR_TRAIT_WIDTH) { - struct variable *variable = - psppire_dict_get_variable (store->dict, var_num); - - g_assert (variable != NULL); - - posn = var_get_case_index (variable); + int posn = var_get_case_index (variable); + struct resize_datum_aux aux; + aux.old_variable = oldvar; + aux.new_variable = variable; + aux.dict = store->dict->dict; + datasheet_resize_column (store->datasheet, posn, var_get_width (variable), + resize_datum, &aux); } - else - { - posn = 0; - } - - psppire_case_file_insert_values (store->case_file, 1, posn); - -#if AXIS_TRANSITION - g_sheet_column_columns_changed (G_SHEET_COLUMN (store), - var_num, 1); -#endif - - g_sheet_model_columns_inserted (G_SHEET_MODEL (store), var_num, 1); } - static void -dict_size_change_callback (GObject *obj, - gint posn, gint adjustment, gpointer data) +insert_variable_callback (GObject *obj, gint var_num, gpointer data) { - PsppireDataStore *store = PSPPIRE_DATA_STORE (data); + struct variable *variable; + PsppireDataStore *store; + gint posn; - const struct variable *v = psppire_dict_get_variable (store->dict, posn); + g_return_if_fail (data); - const gint new_val_width = value_cnt_from_width (var_get_width (v)); + store = PSPPIRE_DATA_STORE (data); - if ( adjustment > 0 ) - psppire_case_file_insert_values (store->case_file, adjustment, - new_val_width - adjustment + - var_get_case_index(v)); + 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); } - - /** * psppire_data_store_new: * @dict: The dictionary for this data_store. @@ -380,34 +373,26 @@ psppire_data_store_new (PsppireDict *dict) { PsppireDataStore *retval; - retval = g_object_new (GTK_TYPE_DATA_STORE, NULL); + retval = g_object_new (PSPPIRE_TYPE_DATA_STORE, NULL); psppire_data_store_set_dictionary (retval, dict); return retval; } - void -psppire_data_store_set_case_file (PsppireDataStore *ds, - PsppireCaseFile *cf) +psppire_data_store_set_reader (PsppireDataStore *ds, + struct casereader *reader) { gint i; - if ( ds->case_file) g_object_unref (ds->case_file); - - ds->case_file = cf; + if ( ds->datasheet) + datasheet_destroy (ds->datasheet); - g_sheet_model_range_changed (G_SHEET_MODEL (ds), - -1, -1, -1, -1); - - for (i = 0 ; i < n_cf_signals ; ++i ) - { - if ( ds->cf_handler_id [i] > 0 ) - g_signal_handler_disconnect (ds->case_file, - ds->cf_handler_id[i]); - } + ds->datasheet = datasheet_create (reader); + g_signal_emit_by_name (ds, "notify", 0, 0); + g_print ("Datasheet row count %d\n", datasheet_get_n_rows (ds->datasheet)); if ( ds->dict ) for (i = 0 ; i < n_dict_signals; ++i ) @@ -419,20 +404,7 @@ psppire_data_store_set_case_file (PsppireDataStore *ds, } } - ds->cf_handler_id [CASES_DELETED] = - g_signal_connect (ds->case_file, "cases-deleted", - G_CALLBACK (delete_cases_callback), - ds); - - ds->cf_handler_id [CASE_INSERTED] = - g_signal_connect (ds->case_file, "case-inserted", - G_CALLBACK (insert_case_callback), - ds); - - ds->cf_handler_id [CASE_CHANGED] = - g_signal_connect (ds->case_file, "case-changed", - G_CALLBACK (changed_case_callback), - ds); + g_signal_emit (ds, signals[BACKEND_CHANGED], 0); } @@ -476,21 +448,11 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di g_signal_connect (dict, "variable-changed", G_CALLBACK (variable_changed_callback), data_store); - - data_store->dict_handler_id [SIZE_CHANGED] = - g_signal_connect (dict, "dict-size-changed", - G_CALLBACK (dict_size_change_callback), - data_store); } /* The entire model has changed */ - g_sheet_model_range_changed (G_SHEET_MODEL (data_store), -1, -1, -1, -1); - -#if AXIS_TRANSITION - g_sheet_column_columns_changed (G_SHEET_COLUMN (data_store), 0, -1); -#endif if ( data_store->dict ) for (i = 0 ; i < n_dict_signals; ++i ) @@ -506,6 +468,13 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di static void psppire_data_store_finalize (GObject *object) { + PsppireDataStore *ds = PSPPIRE_DATA_STORE (object); + + if (ds->datasheet) + { + datasheet_destroy (ds->datasheet); + ds->datasheet = NULL; + } /* must chain up */ (* parent_class->finalize) (object); @@ -520,7 +489,7 @@ psppire_data_store_dispose (GObject *object) if (ds->dispose_has_run) return; - if (ds->case_file) g_object_unref (ds->case_file); + psppire_data_store_set_dictionary (ds, NULL); /* must chain up */ (* parent_class->dispose) (object); @@ -529,208 +498,120 @@ psppire_data_store_dispose (GObject *object) } -gboolean -psppire_data_store_delete_cases (PsppireDataStore *ds, - casenumber first, casenumber count) -{ - g_return_val_if_fail (ds, FALSE); - - return psppire_case_file_delete_cases (ds->case_file, count, first); -} - - /* Insert a blank case before POSN */ 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->case_file->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); - - memset ( case_data_rw_idx (&cc, 0), 0, val_cnt * MAX_SHORT_STRING); - - 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; - } + cc = case_create (proto); + case_set_missing (cc); - result = psppire_case_file_insert_case (ds->case_file, &cc, posn); + result = psppire_data_store_insert_case (ds, cc, posn); - case_destroy (&cc); + case_unref (cc); return result; } - gchar * -psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column) +psppire_data_store_get_string (PsppireDataStore *store, + glong row, const struct variable *var, + bool use_value_label) { - gint idx; - char *text; - const struct fmt_spec *fp ; - const struct variable *pv ; - union value *v ; - GString *s; - - g_return_val_if_fail (store->dict, NULL); - g_return_val_if_fail (store->case_file, NULL); + gchar *string; + union value v; + int width; - if (column >= psppire_dict_get_var_cnt (store->dict)) - return NULL; + g_return_val_if_fail (store != NULL, NULL); + g_return_val_if_fail (store->datasheet != NULL, NULL); + g_return_val_if_fail (var != NULL, NULL); - if ( row >= psppire_case_file_get_case_count (store->case_file)) + if (row < 0 || row >= datasheet_get_n_rows (store->datasheet)) return NULL; - pv = psppire_dict_get_variable (store->dict, column); - - g_assert (pv); - - idx = var_get_case_index (pv); - - g_assert (idx >= 0); - - v = psppire_case_file_get_value (store->case_file, row, idx, NULL, - var_get_width (pv)); + width = var_get_width (var); + value_init (&v, width); + datasheet_get_value (store->datasheet, row, var_get_case_index (var), &v); - g_return_val_if_fail (v, NULL); - - if ( store->show_labels) + string = NULL; + if (use_value_label) { - const gchar *label = var_lookup_value_label (pv, v); - if (label) - { - free (v); - return pspp_locale_to_utf8 (label, -1, 0); - } + const char *label = var_lookup_value_label (var, &v); + if (label != NULL) + string = g_strdup (label); } + if (string == NULL) + string = value_to_text (v, var); - 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); + value_destroy (&v, width); - text = pspp_locale_to_utf8 (s->str, fp->w, 0); - g_string_free (s, TRUE); - - g_strchomp (text); - - free (v); - return text; + return string; } -static gboolean -psppire_data_store_clear_datum (GSheetModel *model, - glong row, glong col) -{ - PsppireDataStore *store = PSPPIRE_DATA_STORE (model); +/* Attempts to update that part of the variable store which corresponds to VAR + within ROW with the value TEXT. - union value v; - const struct variable *pv = psppire_dict_get_variable (store->dict, col); + If USE_VALUE_LABEL is true, and TEXT is a value label for the column's + variable, then stores the value from that value label instead of the literal + TEXT. - const gint index = var_get_case_index (pv) ; - - if ( var_is_numeric (pv)) - v.f = SYSMIS; - else - memcpy (v.s, "", MAX_SHORT_STRING); - - psppire_case_file_set_value (store->case_file, row, index, &v, - var_get_width (pv)); - - return TRUE; -} - - -/* Attempts to update that part of the variable store which corresponds - to ROW, COL with the value TEXT. - Returns true if anything was updated, false otherwise. -*/ + Returns true if anything was updated, false otherwise. */ gboolean psppire_data_store_set_string (PsppireDataStore *store, - const gchar *text, glong row, glong col) + const gchar *text, + glong row, const struct variable *var, + gboolean use_value_label) { + gint case_index; glong n_cases; - const struct variable *pv = psppire_dict_get_variable (store->dict, col); - g_return_val_if_fail (pv, FALSE); + gboolean ok; n_cases = psppire_data_store_get_case_count (store); - - if ( row > n_cases) + if (row > n_cases) return FALSE; - if (row == n_cases) psppire_data_store_insert_new_case (store, row); - psppire_case_file_data_in (store->case_file, row, - var_get_case_index (pv), ss_cstr (text), - var_get_write_format (pv)); + case_index = var_get_case_index (var); + if (use_value_label) + { + const struct val_labs *vls = var_get_value_labels (var); + const union value *value = vls ? val_labs_find_value (vls, text) : NULL; + if (value) + ok = datasheet_put_value (store->datasheet, row, case_index, value); + else + ok = FALSE; + } + else + ok = psppire_data_store_data_in (store, row, case_index, ss_cstr (text), + var_get_print_format (var)); - return TRUE; + if (ok) + g_signal_emit (store, signals [CASE_CHANGED], 0, row); + return ok; } -void -psppire_data_store_set_font (PsppireDataStore *store, - const PangoFontDescription *fd) -{ - g_return_if_fail (store); - g_return_if_fail (PSPPIRE_IS_DATA_STORE (store)); - - store->font_desc = fd; -#if 0 - store->width_of_m = calc_m_width (fd); -#endif - g_signal_emit (store, signals [FONT_CHANGED], 0); - - - g_sheet_model_range_changed (G_SHEET_MODEL (store), - -1, -1, -1, -1); -} - void -psppire_data_store_show_labels (PsppireDataStore *store, gboolean show_labels) +psppire_data_store_clear (PsppireDataStore *ds) { - g_return_if_fail (store); - g_return_if_fail (PSPPIRE_IS_DATA_STORE (store)); + datasheet_destroy (ds->datasheet); + ds->datasheet = NULL; - store->show_labels = show_labels; + psppire_dict_clear (ds->dict); - g_sheet_model_range_changed (G_SHEET_MODEL (store), - -1, -1, -1, -1); -} - - -void -psppire_data_store_clear (PsppireDataStore *data_store) -{ - psppire_case_file_clear (data_store->case_file); - - psppire_dict_clear (data_store->dict); + g_signal_emit (ds, signals [CASES_DELETED], 0, 0, -1); } @@ -742,12 +623,6 @@ psppire_data_store_get_reader (PsppireDataStore *ds) int i; struct casereader *reader ; - for (i = 0 ; i < n_cf_signals ; ++i ) - { - g_signal_handler_disconnect (ds->case_file, ds->cf_handler_id[i]); - ds->cf_handler_id[i] = 0 ; - } - if ( ds->dict ) for (i = 0 ; i < n_dict_signals; ++i ) { @@ -755,7 +630,10 @@ psppire_data_store_get_reader (PsppireDataStore *ds) ds->dict_handler_id[i]); } - reader = psppire_case_file_make_reader (ds->case_file); + reader = datasheet_make_reader (ds->datasheet); + + /* We must not reference this again */ + ds->datasheet = NULL; return reader; } @@ -764,196 +642,182 @@ psppire_data_store_get_reader (PsppireDataStore *ds) /* Column related funcs */ -#if AXIS_TRANSITION -static glong -geometry_get_column_count (const GSheetColumn *geom) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - return MAX (MIN_COLUMNS, psppire_dict_get_var_cnt (ds->dict)); -} - - -static gint -geometry_get_width (const GSheetColumn *geom, glong unit) -{ - const struct variable *pv ; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); +static const gchar null_var_name[]=N_("var"); - if ( unit >= psppire_dict_get_var_cnt (ds->dict) ) - return ds->width_of_m * 8 ; - pv = psppire_dict_get_variable (ds->dict, unit); + - if ( pv == NULL ) - return ds->width_of_m * 8 ; - return ds->width_of_m * var_get_display_width (pv); -} - -static void -geometry_set_width (GSheetColumn *geom, glong unit, gint width) +/* Returns the CASENUMth case, or a null pointer on failure. + */ +struct ccase * +psppire_data_store_get_case (const PsppireDataStore *ds, + casenumber casenum) { - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - struct variable *v = psppire_dict_get_variable (ds->dict, unit); - - g_return_if_fail (v); + g_return_val_if_fail (ds, FALSE); + g_return_val_if_fail (ds->datasheet, FALSE); - var_set_display_width (v, width / ds->width_of_m ); + return datasheet_get_row (ds->datasheet, casenum); } -#endif +gboolean +psppire_data_store_delete_cases (PsppireDataStore *ds, casenumber first, + casenumber n_cases) +{ + g_return_val_if_fail (ds, FALSE); + g_return_val_if_fail (ds->datasheet, FALSE); -static const gchar null_var_name[]=N_("var"); + g_return_val_if_fail (first + n_cases <= + psppire_data_store_get_case_count (ds), FALSE); -/* Row related funcs */ + datasheet_delete_rows (ds->datasheet, first, n_cases); -static glong -geometry_get_row_count (const GSheetRow *geom) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); + g_signal_emit (ds, signals [CASES_DELETED], 0, first, n_cases); - return TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file); + return TRUE; } -#define ROW_HEIGHT 25 - -static gint -geometry_get_height (const GSheetRow *geom, glong unit) -{ - return ROW_HEIGHT; -} -static guint -geometry_get_top_ypixel (const GSheetRow *geo, glong row) -{ - return row * ROW_HEIGHT; -} -static glong -geometry_pixel_to_row (const GSheetRow *geo, guint pixel) +/* Insert case CC into the case file before POSN */ +static gboolean +psppire_data_store_insert_case (PsppireDataStore *ds, + struct ccase *cc, + casenumber posn) { - glong row = pixel / ROW_HEIGHT; - - if (row >= geometry_get_row_count (geo)) - row = geometry_get_row_count (geo) - 1; - - return row; -} + bool result ; + g_return_val_if_fail (ds, FALSE); + g_return_val_if_fail (ds->datasheet, FALSE); -static gboolean -geometry_get_row_sensitivity (const GSheetRow *geom, glong unit) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); + cc = case_ref (cc); + result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1); + if ( result ) + g_signal_emit (ds, signals [CASE_INSERTED], 0, posn); + else + g_warning ("Cannot insert case at position %ld\n", posn); - return (unit < psppire_case_file_get_case_count (ds->case_file)); + return result; } -static gchar * -geometry_get_row_button_label (const GSheetRow *geom, glong unit) -{ - gchar *text; - gchar *s; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - if ( unit > - TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file)) - return 0; - s = g_strdup_printf (_("%ld"), unit + FIRST_CASE_NUMBER); +/* Set the value of VAR in case CASENUM to V. + V must be the correct width for IDX. + Returns true if successful, false on I/O error. */ +gboolean +psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, + const struct variable *var, const union value *v) +{ + glong n_cases; + bool ok; - text = pspp_locale_to_utf8 (s, -1, 0); + g_return_val_if_fail (ds, FALSE); + g_return_val_if_fail (ds->datasheet, FALSE); - g_free (s); + n_cases = psppire_data_store_get_case_count (ds); + if ( casenum > n_cases) + return FALSE; - return text; -} + if (casenum == n_cases) + psppire_data_store_insert_new_case (ds, casenum); -static void -psppire_data_store_sheet_row_init (GSheetRowIface *iface) -{ - iface->get_row_count = geometry_get_row_count; + ok = datasheet_put_value (ds->datasheet, casenum, var_get_case_index (var), + v); + if (ok) + g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum); - iface->get_height = geometry_get_height; - iface->set_height = 0; - iface->get_sensitivity = geometry_get_row_sensitivity; - iface->top_ypixel = geometry_get_top_ypixel; - iface->pixel_to_row = geometry_pixel_to_row; - iface->get_button_label = geometry_get_row_button_label; + return ok; } - -/* Column related stuff */ -static gchar * -get_column_subtitle (const GSheetModel *model, gint col) +/* Set the IDXth value of case C using D_IN */ +static gboolean +psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx, + struct substring input, const struct fmt_spec *fmt) { - gchar *text; - const struct variable *v ; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); + union value value; + int width; + bool ok; - if ( col >= psppire_dict_get_var_cnt (ds->dict) ) - return NULL; + PsppireDict *dict; - v = psppire_dict_get_variable (ds->dict, col); + g_return_val_if_fail (ds, FALSE); + g_return_val_if_fail (ds->datasheet, FALSE); - if ( ! var_has_label (v)) - return NULL; + g_return_val_if_fail (idx < datasheet_get_n_columns (ds->datasheet), FALSE); + + dict = ds->dict; - text = pspp_locale_to_utf8 (var_get_label (v), -1, 0); + 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_msg (input, UTF8, fmt->type, &value, width, + dict_get_encoding (dict->dict)) + && datasheet_put_value (ds->datasheet, casenum, idx, &value)); + value_destroy (&value, width); - return text; + return ok; } -static gchar * -get_column_button_label (const GSheetModel *model, gint col) +/* 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_value (PsppireDataStore *ds, + gint width, gint where) { - gchar *text; - struct variable *pv ; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); + union value value; - if ( col >= psppire_dict_get_var_cnt (ds->dict) ) - return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0); + g_return_val_if_fail (ds, FALSE); - pv = psppire_dict_get_variable (ds->dict, col); + g_assert (width >= 0); - text = pspp_locale_to_utf8 (var_get_name (pv), -1, 0); + if ( ! ds->datasheet ) + ds->datasheet = datasheet_create (NULL); - return text; -} + value_init (&value, width); + value_set_missing (&value, width); -static gboolean -get_column_sensitivity (const GSheetModel *model, gint col) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); + datasheet_insert_column (ds->datasheet, &value, width, where); + value_destroy (&value, width); - return (col < psppire_dict_get_var_cnt (ds->dict)); + return TRUE; } - - -static GtkJustification -get_column_justification (const GSheetModel *model, gint col) +gboolean +psppire_data_store_filtered (PsppireDataStore *ds, + glong row) { - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - const struct variable *pv ; + union value val; - if ( col >= psppire_dict_get_var_cnt (ds->dict) ) - return GTK_JUSTIFY_LEFT; + const struct dictionary *dict; + const struct variable *filter; - pv = psppire_dict_get_variable (ds->dict, col); + if ( row < 0 || row >= datasheet_get_n_rows (ds->datasheet)) + return FALSE; - return (var_get_alignment (pv) == ALIGN_LEFT ? GTK_JUSTIFY_LEFT - : var_get_alignment (pv) == ALIGN_RIGHT ? GTK_JUSTIFY_RIGHT - : GTK_JUSTIFY_CENTER); -} + dict = ds->dict->dict; + g_return_val_if_fail (dict, FALSE); + filter = dict_get_filter (dict); + if ( ! filter) + return FALSE; + g_return_val_if_fail (var_is_numeric (filter), FALSE); + value_init (&val, 0); + if ( ! datasheet_get_value (ds->datasheet, row, + var_get_case_index (filter), + &val) ) + return FALSE; + return (val.f == 0.0); +}