X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=9f7e40754b4851b88678ba450ab8de22370a0264;hb=67ab7839678c0f8aa12459ce5a585a5636f20196;hp=fc5cdf9287d4eea11cbd0fb7833fa7e47edd0e0c;hpb=2bdde1cd21cd58349cf4bd852fddf40524854288;p=pspp diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index fc5cdf9287..9f7e40754b 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", @@ -159,7 +161,7 @@ psppire_data_store_get_var_count (const GSheetModel *model) return psppire_dict_get_var_cnt (store->dict); } -inline casenumber +casenumber psppire_data_store_get_case_count (const PsppireDataStore *store) { return psppire_case_file_get_case_count (store->case_file); @@ -171,7 +173,7 @@ psppire_data_store_get_value_count (const PsppireDataStore *store) return psppire_dict_get_value_cnt (store->dict); } -inline casenumber +casenumber psppire_data_store_get_case_count_wrapper (const GSheetModel *model) { const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); @@ -182,10 +184,9 @@ 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 * @@ -234,13 +235,6 @@ psppire_data_store_sheet_model_init (GSheetModelIface *iface) iface->get_row_count = psppire_data_store_get_case_count_wrapper; } -static -gboolean always_true () -{ - return TRUE; -} - - static void delete_cases_callback (GtkWidget *w, casenumber first, casenumber n_cases, gpointer data) @@ -396,10 +390,8 @@ psppire_data_store_set_case_file (PsppireDataStore *ds, PsppireCaseFile *cf) { gint i; - if ( ds->case_file) - { - g_object_unref (ds->case_file); - } + if ( ds->case_file) g_object_unref (ds->case_file); + ds->case_file = cf; @@ -515,6 +507,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) @@ -659,23 +669,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; + n_cases = psppire_data_store_get_case_count (store); - psppire_case_array_insert_case (store->cases, r, 0, 0); + 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), @@ -788,9 +792,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 ); } @@ -869,7 +875,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; @@ -880,7 +885,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); @@ -890,31 +895,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); @@ -922,9 +927,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; @@ -950,7 +954,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;