X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=1e6568b78afa6bfe6247142da7d0a3f7ac649b00;hb=3af9bac9f7828e3a98bb6a76bd6cf63e8d834a70;hp=40c3843fab3d429fffd3f8c43b27855015180a04;hpb=b810b32ac59e1dcba90b8d4a70d626c4e249bad6;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 40c3843f..1e6568b7 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -159,18 +159,17 @@ psppire_data_store_get_var_count (const GSheetModel *model) return psppire_dict_get_var_cnt (store->dict); } -casenumber -psppire_data_store_get_case_count (PsppireDataStore *store) +inline casenumber +psppire_data_store_get_case_count (const PsppireDataStore *store) { return psppire_case_file_get_case_count (store->case_file); } -static glong -psppire_data_store_get_case_count_from_model (const GSheetModel *model) +inline casenumber +psppire_data_store_get_case_count_wrapper (const GSheetModel *model) { const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - - return psppire_case_file_get_case_count (store->case_file); + return psppire_data_store_get_case_count (store); } static void @@ -179,6 +178,8 @@ psppire_data_store_init (PsppireDataStore *data_store) data_store->dict = 0; data_store->case_file = 0; data_store->width_of_m = 10; + + } const PangoFontDescription * @@ -224,7 +225,7 @@ psppire_data_store_sheet_model_init (GSheetModelIface *iface) 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_from_model; + iface->get_row_count = psppire_data_store_get_case_count_wrapper; } static @@ -282,30 +283,27 @@ changed_case_callback (GtkWidget *w, gint casenum, gpointer data) } +/* + A callback which occurs after a variable has been deleted. + */ static void -delete_variables_callback (GObject *obj, gint var_num, gint n_vars, gpointer data) +delete_variable_callback (GObject *obj, gint dict_index, + gint case_index, gint val_cnt, + gpointer data) { - PsppireDataStore *store ; + PsppireDataStore *store = PSPPIRE_DATA_STORE (data); - g_return_if_fail (data); - - store = PSPPIRE_DATA_STORE (data); - - g_sheet_model_columns_deleted (G_SHEET_MODEL (store), var_num, n_vars); + g_sheet_model_columns_deleted (G_SHEET_MODEL (store), dict_index, 1); g_sheet_column_columns_changed (G_SHEET_COLUMN (store), - var_num, -1); + dict_index, -1); } static void variable_changed_callback (GObject *obj, gint var_num, gpointer data) { - PsppireDataStore *store; - - g_return_if_fail (data); - - store = PSPPIRE_DATA_STORE (data); + PsppireDataStore *store = PSPPIRE_DATA_STORE (data); g_sheet_column_columns_changed (G_SHEET_COLUMN (store), var_num, 1); @@ -353,13 +351,16 @@ static void dict_size_change_callback (GObject *obj, gint posn, gint adjustment, gpointer data) { - PsppireDataStore *store ; + PsppireDataStore *store = PSPPIRE_DATA_STORE (data); - g_return_if_fail (data); + const struct variable *v = psppire_dict_get_variable (store->dict, posn); - store = PSPPIRE_DATA_STORE (data); + const gint new_val_width = value_cnt_from_width (var_get_width (v)); - psppire_case_file_insert_values (store->case_file, adjustment, posn); + if ( adjustment > 0 ) + psppire_case_file_insert_values (store->case_file, adjustment, + new_val_width - adjustment + + var_get_case_index(v)); } @@ -385,30 +386,53 @@ psppire_data_store_new (PsppireDict *dict) void -psppire_data_store_set_case_file (PsppireDataStore *data_store, +psppire_data_store_set_case_file (PsppireDataStore *ds, PsppireCaseFile *cf) { - if ( data_store->case_file) + gint i; + if ( ds->case_file) { - g_object_unref (data_store->case_file); + g_object_unref (ds->case_file); } - data_store->case_file = cf; + ds->case_file = cf; - g_signal_connect (data_store->case_file, "cases-deleted", - G_CALLBACK (delete_cases_callback), - data_store); + g_sheet_model_range_changed (G_SHEET_MODEL (ds), + -1, -1, -1, -1); - g_signal_connect (data_store->case_file, "case-inserted", - G_CALLBACK (insert_case_callback), - data_store); + 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]); + } - g_signal_connect (data_store->case_file, "case-changed", - G_CALLBACK (changed_case_callback), - data_store); -} + if ( ds->dict ) + for (i = 0 ; i < n_dict_signals; ++i ) + { + if ( ds->dict_handler_id [i] > 0) + { + g_signal_handler_unblock (ds->dict, + ds->dict_handler_id[i]); + } + } + + 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); +} /** @@ -422,29 +446,59 @@ psppire_data_store_set_case_file (PsppireDataStore *data_store, void psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *dict) { - data_store->dict = dict; + int i; - g_signal_connect (dict, "variable-inserted", - G_CALLBACK (insert_variable_callback), - data_store); + /* Disconnect any existing handlers */ + if ( data_store->dict ) + for (i = 0 ; i < n_dict_signals; ++i ) + { + g_signal_handler_disconnect (data_store->dict, + data_store->dict_handler_id[i]); + } - g_signal_connect (dict, "variables-deleted", - G_CALLBACK (delete_variables_callback), - data_store); + data_store->dict = dict; + + if ( dict != NULL) + { - g_signal_connect (dict, "variable-changed", - G_CALLBACK (variable_changed_callback), - data_store); + data_store->dict_handler_id [VARIABLE_INSERTED] = + g_signal_connect (dict, "variable-inserted", + G_CALLBACK (insert_variable_callback), + data_store); + + data_store->dict_handler_id [VARIABLE_DELETED] = + g_signal_connect (dict, "variable-deleted", + G_CALLBACK (delete_variable_callback), + data_store); + + data_store->dict_handler_id [VARIABLE_CHANGED] = + 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); + } - 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); g_sheet_column_columns_changed (G_SHEET_COLUMN (data_store), 0, -1); + + + if ( data_store->dict ) + for (i = 0 ; i < n_dict_signals; ++i ) + { + if ( data_store->dict_handler_id [i] > 0) + { + g_signal_handler_block (data_store->dict, + data_store->dict_handler_id[i]); + } + } } static void @@ -479,6 +533,8 @@ psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn) g_return_val_if_fail (val_cnt > 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); @@ -669,8 +725,22 @@ psppire_data_store_clear (PsppireDataStore *data_store) struct casereader * 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 ) + { + g_signal_handler_block (ds->dict, + ds->dict_handler_id[i]); + } + reader = psppire_case_file_make_reader (ds->case_file); return reader; @@ -811,11 +881,29 @@ geometry_get_row_count (const GSheetRow *geom, gpointer data) 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, gpointer data) { - return 25; + return ROW_HEIGHT; +} + +static guint +geometry_get_top_ypixel (const GSheetRow *geo, glong row, gpointer data) +{ + return row * ROW_HEIGHT; +} + +static glong +geometry_pixel_to_row (const GSheetRow *geo, guint pixel, gpointer data) +{ + glong row = pixel / ROW_HEIGHT; + + if (row >= geometry_get_row_count (geo, data)) + row = geometry_get_row_count (geo, data) - 1; + + return row; } @@ -849,7 +937,6 @@ geometry_get_row_button_label (const GSheetRow *geom, glong unit, gpointer data) return text; } - static void psppire_data_store_sheet_row_init (GSheetRowIface *iface) { @@ -859,6 +946,7 @@ psppire_data_store_sheet_row_init (GSheetRowIface *iface) iface->set_height = 0; iface->get_visibility = always_true; 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; }