X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=dee18378d4ae61bf8b4386bf24d517b0c2c38e9e;hb=c5bf90ff8baa7a81274421acb24a915c953e560f;hp=323196e459bee11d9afb4773ce802b220334c32d;hpb=3358031c44f487dde08fddf3ebf9200eb9087d7e;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 323196e4..dee18378 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -25,9 +25,9 @@ #include #include -#include #include #include +#include #include @@ -39,6 +39,7 @@ #include #include #include +#include static void psppire_data_store_init (PsppireDataStore *data_store); @@ -48,13 +49,13 @@ static void psppire_data_store_sheet_column_init (GSheetColumnIface *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); #define MIN_COLUMNS 10 - #define TRAILING_ROWS 10 static GObjectClass *parent_class = NULL; @@ -66,7 +67,7 @@ enum {FONT_CHANGED, static guint signals [n_SIGNALS]; -inline GType +GType psppire_data_store_get_type (void) { static GType data_store_type = 0; @@ -137,6 +138,7 @@ psppire_data_store_class_init (PsppireDataStoreClass *class) object_class = (GObjectClass*) class; object_class->finalize = psppire_data_store_finalize; + object_class->dispose = psppire_data_store_dispose; signals [FONT_CHANGED] = g_signal_new ("font_changed", @@ -160,25 +162,31 @@ psppire_data_store_get_var_count (const GSheetModel *model) } casenumber -psppire_data_store_get_case_count (PsppireDataStore *store) +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) +size_t +psppire_data_store_get_value_count (const PsppireDataStore *store) { - const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + return psppire_dict_get_value_cnt (store->dict); +} - return psppire_case_file_get_case_count (store->case_file); +casenumber +psppire_data_store_get_case_count_wrapper (const GSheetModel *model) +{ + const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + return psppire_data_store_get_case_count (store); } static void psppire_data_store_init (PsppireDataStore *data_store) { data_store->dict = 0; - data_store->case_file = 0; + data_store->case_file = NULL; data_store->width_of_m = 10; + data_store->dispose_has_run = FALSE; } const PangoFontDescription * @@ -224,7 +232,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 @@ -385,36 +393,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) - { - g_object_unref (data_store->case_file); - } + gint i; + if ( ds->case_file) g_object_unref (ds->case_file); + - data_store->case_file = cf; + ds->case_file = cf; - g_sheet_model_range_changed (G_SHEET_MODEL (data_store), + 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]); + } + - g_signal_connect (data_store->case_file, "cases-deleted", - G_CALLBACK (delete_cases_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]); + } + } - g_signal_connect (data_store->case_file, "case-inserted", - G_CALLBACK (insert_case_callback), - data_store); + 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); - g_signal_connect (data_store->case_file, "case-changed", - G_CALLBACK (changed_case_callback), - data_store); + ds->cf_handler_id [CASE_CHANGED] = + g_signal_connect (ds->case_file, "case-changed", + G_CALLBACK (changed_case_callback), + ds); } - /** * psppire_data_store_replace_set_dictionary: * @data_store: The variable store @@ -426,28 +451,59 @@ psppire_data_store_set_case_file (PsppireDataStore *data_store, void psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *dict) { + int i; + + /* 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]); + } + data_store->dict = dict; - g_signal_connect (dict, "variable-inserted", - G_CALLBACK (insert_variable_callback), - data_store); + if ( dict != NULL) + { - g_signal_connect (dict, "variable-deleted", - G_CALLBACK (delete_variable_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, "variable-changed", - G_CALLBACK (variable_changed_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 @@ -458,6 +514,24 @@ psppire_data_store_finalize (GObject *object) (* parent_class->finalize) (object); } + +static void +psppire_data_store_dispose (GObject *object) +{ + PsppireDataStore *ds = PSPPIRE_DATA_STORE (object); + + if (ds->dispose_has_run) + return; + + if (ds->case_file) g_object_unref (ds->case_file); + + /* must chain up */ + (* parent_class->dispose) (object); + + ds->dispose_has_run = TRUE; +} + + gboolean psppire_data_store_delete_cases (PsppireDataStore *ds, casenumber first, casenumber count) @@ -602,23 +676,17 @@ gboolean psppire_data_store_set_string (PsppireDataStore *store, const gchar *text, glong row, glong col) { + glong n_cases; const struct variable *pv = psppire_dict_get_variable (store->dict, col); g_return_val_if_fail (pv, FALSE); -#if 0 - /* Allow the user to insert a lot of blank cases, simply by skipping rows */ - for (r = psppire_case_file_get_case_count (store->case_file); r <= row ; ++r) - { - - gint c; - - psppire_case_array_insert_case (store->cases, r, 0, 0); + n_cases = psppire_data_store_get_case_count (store); + if ( row > n_cases) + return FALSE; - for (c = 0 ; c < psppire_dict_get_var_cnt (store->dict); ++c ) - psppire_data_store_clear_datum (model, r, c); - } -#endif + 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), @@ -674,8 +742,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; @@ -717,9 +799,11 @@ geometry_set_width (GSheetColumn *geom, glong unit, gint width) { PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - struct variable *pv = psppire_dict_get_variable (ds->dict, unit); + struct variable *v = psppire_dict_get_variable (ds->dict, unit); + + g_return_if_fail (v); - var_set_display_width (pv, width / ds->width_of_m ); + var_set_display_width (v, width / ds->width_of_m ); } @@ -798,7 +882,6 @@ psppire_data_store_sheet_column_init (GSheetColumnIface *iface) iface->get_column_count = geometry_get_column_count; iface->get_width = geometry_get_width; iface->set_width = geometry_set_width; - iface->get_visibility = always_true; iface->get_sensitivity = geometry_get_sensitivity; iface->get_justification = geometry_get_justification; iface->get_button_label = geometry_get_column_button_label; @@ -809,7 +892,7 @@ psppire_data_store_sheet_column_init (GSheetColumnIface *iface) /* Row related funcs */ static glong -geometry_get_row_count (const GSheetRow *geom, gpointer data) +geometry_get_row_count (const GSheetRow *geom) { PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); @@ -819,31 +902,31 @@ geometry_get_row_count (const GSheetRow *geom, gpointer data) #define ROW_HEIGHT 25 static gint -geometry_get_height (const GSheetRow *geom, glong unit, gpointer data) +geometry_get_height (const GSheetRow *geom, glong unit) { return ROW_HEIGHT; } static guint -geometry_get_top_ypixel (const GSheetRow *geo, glong row, gpointer data) +geometry_get_top_ypixel (const GSheetRow *geo, glong row) { return row * ROW_HEIGHT; } static glong -geometry_pixel_to_row (const GSheetRow *geo, guint pixel, gpointer data) +geometry_pixel_to_row (const GSheetRow *geo, guint pixel) { glong row = pixel / ROW_HEIGHT; - if (row >= geometry_get_row_count (geo, data)) - row = geometry_get_row_count (geo, data) -1; + 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, gpointer data) +geometry_get_row_sensitivity (const GSheetRow *geom, glong unit) { PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); @@ -851,9 +934,8 @@ geometry_get_row_sensitivity (const GSheetRow *geom, glong unit, gpointer data) return (unit < psppire_case_file_get_case_count (ds->case_file)); } - static gchar * -geometry_get_row_button_label (const GSheetRow *geom, glong unit, gpointer data) +geometry_get_row_button_label (const GSheetRow *geom, glong unit) { gchar *text; gchar *s; @@ -879,7 +961,6 @@ psppire_data_store_sheet_row_init (GSheetRowIface *iface) iface->get_height = geometry_get_height; 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;