X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=29efbb16c72783d360410a1d6e095ee68f41d731;hb=fe7885d731f2dcb6f30e97192b51f493abcfc2c9;hp=9835d307fb80eafc3361d062e72b121f77fc7d89;hpb=11706f97dd318697e43e6468b130ca5b7f1bff87;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 9835d307..29efbb16 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -26,12 +26,11 @@ #include #include -#include +#include #include #include "psppire-data-store.h" -#include "psppire-case-file.h" #include "helper.h" #include @@ -40,11 +39,16 @@ #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); @@ -53,14 +57,29 @@ static gboolean psppire_data_store_clear_datum (GSheetModel *model, glong row, glong column); -#define MIN_COLUMNS 10 -#define TRAILING_ROWS 10 +static gboolean psppire_data_store_insert_case (PsppireDataStore *ds, + struct ccase *cc, + casenumber posn); + + +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]; @@ -92,24 +111,15 @@ psppire_data_store_get_type (void) NULL }; - static const GInterfaceInfo sheet_row_info = - { - (GInterfaceInitFunc) psppire_data_store_sheet_row_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); } return data_store_type; @@ -127,8 +137,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,10 +146,62 @@ 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); + + + 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); + + 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_values (PsppireDataStore *ds, + gint n_values, gint where); + +static union value * +psppire_data_store_get_value (const PsppireDataStore *ds, + casenumber casenum, size_t idx, + union value *value, int width); + + +static gboolean +psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, + gint idx, union value *v, gint width); + + + + static glong psppire_data_store_get_var_count (const GSheetModel *model) { @@ -151,7 +213,7 @@ psppire_data_store_get_var_count (const GSheetModel *model) casenumber psppire_data_store_get_case_count (const PsppireDataStore *store) { - return psppire_case_file_get_case_count (store->case_file); + return datasheet_get_row_cnt (store->datasheet); } size_t @@ -171,20 +233,10 @@ 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->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) @@ -209,6 +261,9 @@ 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_row_button_label (const GSheetModel *model, gint row); +static gboolean get_row_sensitivity (const GSheetModel *model, gint row); + static void psppire_data_store_sheet_model_init (GSheetModelIface *iface) @@ -218,10 +273,8 @@ psppire_data_store_sheet_model_init (GSheetModelIface *iface) 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; @@ -230,53 +283,9 @@ psppire_data_store_sheet_model_init (GSheetModelIface *iface) 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); + iface->get_row_title = get_row_button_label; + iface->get_row_sensitivity = get_row_sensitivity; } @@ -299,6 +308,7 @@ delete_variable_callback (GObject *obj, gint dict_index, } + static void variable_changed_callback (GObject *obj, gint var_num, gpointer data) { @@ -339,7 +349,7 @@ insert_variable_callback (GObject *obj, gint var_num, gpointer data) posn = 0; } - psppire_case_file_insert_values (store->case_file, 1, posn); + psppire_data_store_insert_values (store, 1, posn); #if AXIS_TRANSITION g_sheet_column_columns_changed (G_SHEET_COLUMN (store), @@ -361,7 +371,7 @@ dict_size_change_callback (GObject *obj, const gint new_val_width = value_cnt_from_width (var_get_width (v)); if ( adjustment > 0 ) - psppire_case_file_insert_values (store->case_file, adjustment, + psppire_data_store_insert_values (store, adjustment, new_val_width - adjustment + var_get_case_index(v)); } @@ -387,28 +397,20 @@ psppire_data_store_new (PsppireDict *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); + if ( ds->datasheet) + datasheet_destroy (ds->datasheet); - ds->case_file = cf; + ds->datasheet = datasheet_create (reader); 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]); - } - - if ( ds->dict ) for (i = 0 ; i < n_dict_signals; ++i ) { @@ -419,20 +421,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); } @@ -520,7 +509,11 @@ psppire_data_store_dispose (GObject *object) if (ds->dispose_has_run) return; - if (ds->case_file) g_object_unref (ds->case_file); + if (ds->datasheet) + { + datasheet_destroy (ds->datasheet); + ds->datasheet = NULL; + } /* must chain up */ (* parent_class->dispose) (object); @@ -529,16 +522,6 @@ 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 @@ -549,7 +532,7 @@ psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn) struct ccase cc; g_return_val_if_fail (ds, FALSE); - val_cnt = datasheet_get_column_cnt (ds->case_file->datasheet) ; + val_cnt = datasheet_get_column_cnt (ds->datasheet) ; g_return_val_if_fail (val_cnt > 0, FALSE); @@ -568,7 +551,7 @@ psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn) case_data_rw (&cc, pv)->f = SYSMIS; } - result = psppire_case_file_insert_case (ds->case_file, &cc, posn); + result = psppire_data_store_insert_case (ds, &cc, posn); case_destroy (&cc); @@ -587,12 +570,12 @@ psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column) GString *s; g_return_val_if_fail (store->dict, NULL); - g_return_val_if_fail (store->case_file, NULL); + g_return_val_if_fail (store->datasheet, NULL); if (column >= psppire_dict_get_var_cnt (store->dict)) return NULL; - if ( row >= psppire_case_file_get_case_count (store->case_file)) + if ( row >= psppire_data_store_get_case_count (store)) return NULL; pv = psppire_dict_get_variable (store->dict, column); @@ -603,7 +586,7 @@ psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column) g_assert (idx >= 0); - v = psppire_case_file_get_value (store->case_file, row, idx, NULL, + v = psppire_data_store_get_value (store, row, idx, NULL, var_get_width (pv)); g_return_val_if_fail (v, NULL); @@ -658,8 +641,8 @@ psppire_data_store_clear_datum (GSheetModel *model, else memcpy (v.s, "", MAX_SHORT_STRING); - psppire_case_file_set_value (store->case_file, row, index, &v, - var_get_width (pv)); + psppire_data_store_set_value (store, row, index, &v, + var_get_width (pv)); return TRUE; } @@ -685,32 +668,14 @@ psppire_data_store_set_string (PsppireDataStore *store, 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)); + psppire_data_store_data_in (store, row, + var_get_case_index (pv), ss_cstr (text), + var_get_write_format (pv)); return TRUE; } -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) @@ -726,11 +691,14 @@ psppire_data_store_show_labels (PsppireDataStore *store, gboolean show_labels) void -psppire_data_store_clear (PsppireDataStore *data_store) +psppire_data_store_clear (PsppireDataStore *ds) { - psppire_case_file_clear (data_store->case_file); + datasheet_destroy (ds->datasheet); + ds->datasheet = NULL; + + psppire_dict_clear (ds->dict); - psppire_dict_clear (data_store->dict); + g_signal_emit (ds, signals [CASES_DELETED], 0, 0, -1); } @@ -742,12 +710,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 +717,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,128 +729,32 @@ 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); - - 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) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - struct variable *v = psppire_dict_get_variable (ds->dict, unit); - - g_return_if_fail (v); - - var_set_display_width (v, width / ds->width_of_m ); -} - -#endif - static const gchar null_var_name[]=N_("var"); + /* Row related funcs */ -static glong -geometry_get_row_count (const GSheetRow *geom) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - return TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file); -} - -#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) -{ - glong row = pixel / ROW_HEIGHT; - - if (row >= geometry_get_row_count (geo)) - row = geometry_get_row_count (geo) - 1; - - return row; -} - - -static gboolean -geometry_get_row_sensitivity (const GSheetRow *geom, glong unit) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - - return (unit < psppire_case_file_get_case_count (ds->case_file)); -} - static gchar * -geometry_get_row_button_label (const GSheetRow *geom, glong unit) +get_row_button_label (const GSheetModel *model, gint unit) { - gchar *text; - gchar *s; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); + gchar *s = g_strdup_printf (_("%d"), unit + FIRST_CASE_NUMBER); - if ( unit > - TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file)) - return 0; - - s = g_strdup_printf (_("%ld"), unit + FIRST_CASE_NUMBER); - - text = pspp_locale_to_utf8 (s, -1, 0); + gchar *text = pspp_locale_to_utf8 (s, -1, 0); g_free (s); return text; } -static void -psppire_data_store_sheet_row_init (GSheetRowIface *iface) + +static gboolean +get_row_sensitivity (const GSheetModel *model, gint unit) { - iface->get_row_count = geometry_get_row_count; + PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - 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 (unit < psppire_data_store_get_case_count (ds)); } @@ -957,3 +826,174 @@ get_column_justification (const GSheetModel *model, gint col) } + + + + +/* Fills C with the CASENUMth case. + Returns true on success, false otherwise. + */ +gboolean +psppire_data_store_get_case (const PsppireDataStore *ds, + casenumber casenum, + struct ccase *c) +{ + g_return_val_if_fail (ds, FALSE); + g_return_val_if_fail (ds->datasheet, FALSE); + + return datasheet_get_row (ds->datasheet, casenum, c); +} + + +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); + + g_return_val_if_fail (first + n_cases <= + psppire_data_store_get_case_count (ds), FALSE); + + + datasheet_delete_rows (ds->datasheet, first, n_cases); + + g_signal_emit (ds, signals [CASES_DELETED], 0, first, n_cases); + + return TRUE; +} + + + +/* Insert case CC into the case file before POSN */ +static gboolean +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); + + if ( result ) + g_signal_emit (ds, signals [CASE_INSERTED], 0, posn); + else + g_warning ("Cannot insert case at position %ld\n", posn); + + return result; +} + + +/* 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 * +psppire_data_store_get_value (const PsppireDataStore *ds, + casenumber casenum, size_t idx, + union value *value, int width) +{ + 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_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; +} + + + +/* Set the IDXth value of case C to V. + 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) +{ + 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); + + ok = datasheet_put_value (ds->datasheet, casenum, idx, v, width); + if (ok) + g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum); + return ok; +} + + + + +/* 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) +{ + union value *value = NULL; + int width; + 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); + + 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)); + + if (ok) + g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum); + + freea (value); + + return TRUE; +} + +/* Resize the cases in the casefile, by inserting N_VALUES into every + one of them at the position immediately preceeding WHERE. +*/ +static gboolean +psppire_data_store_insert_values (PsppireDataStore *ds, + gint n_values, gint where) +{ + g_return_val_if_fail (ds, FALSE); + + if ( n_values == 0 ) + return FALSE; + + g_assert (n_values > 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); + } + + return TRUE; +}