X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=9835d307fb80eafc3361d062e72b121f77fc7d89;hb=11706f97dd318697e43e6468b130ca5b7f1bff87;hp=afbe3d2fe31f82fb83b4149a2a9656b902d9bc7a;hpb=f404544337964f80bb2d1fee5acb147f7023bc08;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index afbe3d2f..9835d307 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 Free Software Foundation + Copyright (C) 2006, 2008 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 @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -45,7 +44,6 @@ 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_column_init (GSheetColumnIface *iface); static void psppire_data_store_sheet_row_init (GSheetRowIface *iface); static void psppire_data_store_finalize (GObject *object); @@ -56,7 +54,6 @@ static gboolean psppire_data_store_clear_datum (GSheetModel *model, #define MIN_COLUMNS 10 - #define TRAILING_ROWS 10 static GObjectClass *parent_class = NULL; @@ -95,13 +92,6 @@ psppire_data_store_get_type (void) NULL }; - static const GInterfaceInfo sheet_column_info = - { - (GInterfaceInitFunc) psppire_data_store_sheet_column_init, - NULL, - NULL - }; - static const GInterfaceInfo sheet_row_info = { (GInterfaceInitFunc) psppire_data_store_sheet_row_init, @@ -117,10 +107,6 @@ psppire_data_store_get_type (void) G_TYPE_SHEET_MODEL, &sheet_model_info); - g_type_add_interface_static (data_store_type, - G_TYPE_SHEET_COLUMN, - &sheet_column_info); - g_type_add_interface_static (data_store_type, G_TYPE_SHEET_ROW, &sheet_row_info); @@ -218,6 +204,11 @@ psppire_data_store_set_string_wrapper (GSheetModel *model, +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) @@ -234,15 +225,13 @@ psppire_data_store_sheet_model_init (GSheetModelIface *iface) 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; -} -static -gboolean always_true () -{ - return TRUE; + 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) @@ -301,10 +290,12 @@ delete_variable_callback (GObject *obj, gint dict_index, { PsppireDataStore *store = PSPPIRE_DATA_STORE (data); +#if AXIS_TRANSITION g_sheet_model_columns_deleted (G_SHEET_MODEL (store), dict_index, 1); g_sheet_column_columns_changed (G_SHEET_COLUMN (store), dict_index, -1); +#endif } @@ -313,6 +304,7 @@ variable_changed_callback (GObject *obj, gint var_num, gpointer data) { PsppireDataStore *store = PSPPIRE_DATA_STORE (data); +#if AXIS_TRANSITION g_sheet_column_columns_changed (G_SHEET_COLUMN (store), var_num, 1); @@ -320,6 +312,7 @@ variable_changed_callback (GObject *obj, gint var_num, gpointer data) g_sheet_model_range_changed (G_SHEET_MODEL (store), -1, var_num, -1, var_num); +#endif } static void @@ -348,8 +341,10 @@ insert_variable_callback (GObject *obj, gint var_num, gpointer data) 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); } @@ -493,8 +488,9 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di /* 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 ) @@ -768,6 +764,7 @@ psppire_data_store_get_reader (PsppireDataStore *ds) /* Column related funcs */ +#if AXIS_TRANSITION static glong geometry_get_column_count (const GSheetColumn *geom) { @@ -800,93 +797,17 @@ 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); - - var_set_display_width (pv, width / ds->width_of_m ); -} - - - -static GtkJustification -geometry_get_justification (const GSheetColumn *geom, glong unit) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - const struct variable *pv ; - - - if ( unit >= psppire_dict_get_var_cnt (ds->dict) ) - return GTK_JUSTIFY_LEFT; - - pv = psppire_dict_get_variable (ds->dict, unit); - - return (var_get_alignment (pv) == ALIGN_LEFT ? GTK_JUSTIFY_LEFT - : var_get_alignment (pv) == ALIGN_RIGHT ? GTK_JUSTIFY_RIGHT - : GTK_JUSTIFY_CENTER); -} - - -static const gchar null_var_name[]=N_("var"); - -static gchar * -geometry_get_column_button_label (const GSheetColumn *geom, glong unit) -{ - gchar *text; - struct variable *pv ; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - if ( unit >= psppire_dict_get_var_cnt (ds->dict) ) - return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0); - - pv = psppire_dict_get_variable (ds->dict, unit); - - text = pspp_locale_to_utf8 (var_get_name (pv), -1, 0); - - return text; -} - - -static gchar * -geometry_get_column_subtitle (const GSheetColumn *geom, glong unit) -{ - gchar *text; - const struct variable *v ; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - if ( unit >= psppire_dict_get_var_cnt (ds->dict) ) - return NULL; - - v = psppire_dict_get_variable (ds->dict, unit); - - if ( ! var_has_label (v)) - return NULL; + struct variable *v = psppire_dict_get_variable (ds->dict, unit); - text = pspp_locale_to_utf8 (var_get_label (v), -1, 0); + g_return_if_fail (v); - return text; + var_set_display_width (v, width / ds->width_of_m ); } - -static gboolean -geometry_get_sensitivity (const GSheetColumn *geom, glong unit) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - return (unit < psppire_dict_get_var_cnt (ds->dict)); -} +#endif -static void -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; - iface->get_subtitle = geometry_get_column_subtitle; -} +static const gchar null_var_name[]=N_("var"); /* Row related funcs */ @@ -934,7 +855,6 @@ geometry_get_row_sensitivity (const GSheetRow *geom, glong unit) return (unit < psppire_case_file_get_case_count (ds->case_file)); } - static gchar * geometry_get_row_button_label (const GSheetRow *geom, glong unit) { @@ -962,9 +882,78 @@ 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; iface->get_button_label = geometry_get_row_button_label; } + + + + +/* Column related stuff */ + +static gchar * +get_column_subtitle (const GSheetModel *model, gint col) +{ + gchar *text; + const struct variable *v ; + PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); + + if ( col >= psppire_dict_get_var_cnt (ds->dict) ) + return NULL; + + v = psppire_dict_get_variable (ds->dict, col); + + if ( ! var_has_label (v)) + return NULL; + + text = pspp_locale_to_utf8 (var_get_label (v), -1, 0); + + return text; +} + +static gchar * +get_column_button_label (const GSheetModel *model, gint col) +{ + gchar *text; + struct variable *pv ; + PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); + + if ( col >= psppire_dict_get_var_cnt (ds->dict) ) + return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0); + + pv = psppire_dict_get_variable (ds->dict, col); + + text = pspp_locale_to_utf8 (var_get_name (pv), -1, 0); + + return text; +} + +static gboolean +get_column_sensitivity (const GSheetModel *model, gint col) +{ + PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); + + return (col < psppire_dict_get_var_cnt (ds->dict)); +} + + + +static GtkJustification +get_column_justification (const GSheetModel *model, gint col) +{ + PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); + const struct variable *pv ; + + if ( col >= psppire_dict_get_var_cnt (ds->dict) ) + return GTK_JUSTIFY_LEFT; + + pv = psppire_dict_get_variable (ds->dict, col); + + return (var_get_alignment (pv) == ALIGN_LEFT ? GTK_JUSTIFY_LEFT + : var_get_alignment (pv) == ALIGN_RIGHT ? GTK_JUSTIFY_RIGHT + : GTK_JUSTIFY_CENTER); +} + +