X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-spreadsheet-model.c;h=bd186ca46d4f8ed57bd541467cdb8a5c3915a0b5;hb=b78aa5f6c822c055d1c3e98cb868c17070402799;hp=2cd70be6fc0e6065763f9fba0e72cc9831b3149d;hpb=c3b2f2e8406224a796f9f0f87048d9400c509265;p=pspp diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c index 2cd70be6fc..bd186ca46d 100644 --- a/src/ui/gui/psppire-spreadsheet-model.c +++ b/src/ui/gui/psppire-spreadsheet-model.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2013 Free Software Foundation + Copyright (C) 2013, 2014 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 @@ -14,26 +14,38 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This file implements a GtkTreeModel. It allows GtkComboBox and + GtkTreeView to display the names and non-empty cell ranges of the + sheets aka "Tables" of spreadsheet files. + It doesn't take any notice of the spreadsheet data itself. +*/ #include #include -#include "psppire-spreadsheet-model.h" +#include + +#include +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + +#include "psppire-spreadsheet-model.h" #include "data/spreadsheet-reader.h" -#include "data/gnumeric-reader.h" -static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *spreadsheetModel); -static void psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass *class); +static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel * + spreadsheetModel); +static void psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass + * class); -static void psppire_spreadsheet_model_finalize (GObject *object); -static void psppire_spreadsheet_model_dispose (GObject *object); +static void psppire_spreadsheet_model_finalize (GObject * object); +static void psppire_spreadsheet_model_dispose (GObject * object); static GObjectClass *parent_class = NULL; -static void spreadsheet_tree_model_init (GtkTreeModelIface *iface); +static void spreadsheet_tree_model_init (GtkTreeModelIface * iface); GType @@ -43,31 +55,30 @@ psppire_spreadsheet_model_get_type (void) if (!object_type) { - static const GTypeInfo spreadsheet_model_info = - { - sizeof (PsppireSpreadsheetModelClass), - NULL, /* base_init */ - NULL, /* base_finalize */ + static const GTypeInfo spreadsheet_model_info = { + sizeof (PsppireSpreadsheetModelClass), + NULL, /* base_init */ + NULL, /* base_finalize */ (GClassInitFunc) psppire_spreadsheet_model_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ + NULL, /* class_finalize */ + NULL, /* class_data */ sizeof (PsppireSpreadsheetModel), - 0, + 0, (GInstanceInitFunc) psppire_spreadsheet_model_init, }; static const GInterfaceInfo tree_model_info = { - (GInterfaceInitFunc) spreadsheet_tree_model_init, - NULL, - NULL + (GInterfaceInitFunc) spreadsheet_tree_model_init, + NULL, + NULL }; - + object_type = g_type_register_static (G_TYPE_OBJECT, - "PsppireSpreadsheetModel", - &spreadsheet_model_info, 0); + "PsppireSpreadsheetModel", + &spreadsheet_model_info, 0); g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL, - &tree_model_info); + &tree_model_info); } return object_type; @@ -83,17 +94,19 @@ enum static void -psppire_spreadsheet_model_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +psppire_spreadsheet_model_set_property (GObject * object, + guint prop_id, + const GValue * value, + GParamSpec * pspec) { - PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (object); + PsppireSpreadsheetModel *spreadsheetModel = + PSPPIRE_SPREADSHEET_MODEL (object); switch (prop_id) { case PROP_SPREADSHEET: spreadsheetModel->spreadsheet = g_value_get_pointer (value); + spreadsheet_ref (spreadsheetModel->spreadsheet); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -102,39 +115,43 @@ psppire_spreadsheet_model_set_property (GObject *object, } - static void -psppire_spreadsheet_model_dispose (GObject *object) +psppire_spreadsheet_model_dispose (GObject * object) { + PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (object); + + if (!spreadsheetModel->dispose_has_run) + { + spreadsheet_unref (spreadsheetModel->spreadsheet); + + spreadsheetModel->dispose_has_run = TRUE; + } } static void -psppire_spreadsheet_model_finalize (GObject *object) +psppire_spreadsheet_model_finalize (GObject * object) { // PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (object); } static void -psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass *class) +psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass * class) { GObjectClass *object_class; - GParamSpec *spreadsheet_spec = - g_param_spec_pointer ("spreadsheet", - "Spreadsheet", - "The spreadsheet that this model represents", - G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE); + GParamSpec *spreadsheet_spec = g_param_spec_pointer ("spreadsheet", + "Spreadsheet", + "The spreadsheet that this model represents", + G_PARAM_CONSTRUCT_ONLY + | G_PARAM_WRITABLE); parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; + object_class = (GObjectClass *) class; object_class->set_property = psppire_spreadsheet_model_set_property; g_object_class_install_property (object_class, - PROP_SPREADSHEET, - spreadsheet_spec); - - + PROP_SPREADSHEET, spreadsheet_spec); object_class->finalize = psppire_spreadsheet_model_finalize; object_class->dispose = psppire_spreadsheet_model_dispose; @@ -142,56 +159,54 @@ psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass *class) static void -psppire_spreadsheet_model_init (PsppireSpreadsheetModel *spreadsheetModel) +psppire_spreadsheet_model_init (PsppireSpreadsheetModel * spreadsheetModel) { spreadsheetModel->dispose_has_run = FALSE; spreadsheetModel->stamp = g_random_int (); } -GtkTreeModel* +GtkTreeModel * psppire_spreadsheet_model_new (struct spreadsheet *sp) { - return g_object_new (psppire_spreadsheet_model_get_type (), - "spreadsheet", sp, - NULL); + return g_object_new (psppire_spreadsheet_model_get_type (), + "spreadsheet", sp, NULL); } - - -static const gint N_COLS = 2; - -static gint -tree_model_n_columns (GtkTreeModel *model) +static gint +tree_model_n_columns (GtkTreeModel * model) { - return N_COLS; + return PSPPIRE_SPREADSHEET_MODEL_N_COLS; } static GtkTreeModelFlags -tree_model_get_flags (GtkTreeModel *model) +tree_model_get_flags (GtkTreeModel * model) { - g_return_val_if_fail (PSPPIRE_IS_SPREADSHEET_MODEL (model), (GtkTreeModelFlags) 0); + g_return_val_if_fail (PSPPIRE_IS_SPREADSHEET_MODEL (model), + (GtkTreeModelFlags) 0); return GTK_TREE_MODEL_LIST_ONLY; } static GType -tree_model_column_type (GtkTreeModel *model, gint index) +tree_model_column_type (GtkTreeModel * model, gint index) { g_return_val_if_fail (PSPPIRE_IS_SPREADSHEET_MODEL (model), (GType) 0); - g_return_val_if_fail (index < N_COLS, (GType) 0); - + g_return_val_if_fail (index < PSPPIRE_SPREADSHEET_MODEL_N_COLS, (GType) 0); + return G_TYPE_STRING; } static gboolean -tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path) +tree_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter, + GtkTreePath * path) { - PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model); + PsppireSpreadsheetModel *spreadsheetModel = + PSPPIRE_SPREADSHEET_MODEL (model); gint *indices, depth; gint n; @@ -203,10 +218,10 @@ tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path) indices = gtk_tree_path_get_indices (path); - n = indices [0]; + n = indices[0]; iter->stamp = spreadsheetModel->stamp; - iter->user_data = (gpointer) n; + iter->user_data = (gpointer) (intptr_t) n; return TRUE; } @@ -214,13 +229,14 @@ tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path) static gboolean tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) { - PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model); + PsppireSpreadsheetModel *spreadsheetModel = + PSPPIRE_SPREADSHEET_MODEL (model); g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, FALSE); - if ( iter == NULL) + if (iter == NULL) return FALSE; - if ( (gint) iter->user_data >= spreadsheetModel->spreadsheet->sheets - 1) + if ((intptr_t) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1) { iter->user_data = NULL; iter->stamp = 0; @@ -234,74 +250,87 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) static void -tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, - gint column, GValue *value) +tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter, + gint column, GValue * value) { - PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model); - g_return_if_fail (column < N_COLS); + PsppireSpreadsheetModel *spreadsheetModel = + PSPPIRE_SPREADSHEET_MODEL (model); + g_return_if_fail (column < PSPPIRE_SPREADSHEET_MODEL_N_COLS); g_return_if_fail (iter->stamp == spreadsheetModel->stamp); g_value_init (value, G_TYPE_STRING); switch (column) { - case 0: + case PSPPIRE_SPREADSHEET_MODEL_COL_NAME: { - char *x = gnumeric_get_sheet_name (spreadsheetModel->spreadsheet, (gint) iter->user_data); - g_value_set_string (value, x); + const char *x = + spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet, + (intptr_t) iter->user_data); + + g_value_set_string (value, x); } break; - case 1: - g_value_set_string (value, "bar"); + case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE: + { + char *x = + spreadsheet_get_sheet_range (spreadsheetModel->spreadsheet, + (intptr_t) iter->user_data); + + g_value_set_string (value, x ? x : _("(empty)")); + g_free (x); + } break; default: - g_critical ("Bad column"); + g_error ("%s:%d Invalid column in spreadsheet model", + __FILE__, __LINE__); break; - } + } } static gboolean -tree_model_nth_child (GtkTreeModel *model, GtkTreeIter *iter, - GtkTreeIter *parent, gint n) +tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter, + GtkTreeIter * parent, gint n) { - PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model); + PsppireSpreadsheetModel *spreadsheetModel = + PSPPIRE_SPREADSHEET_MODEL (model); - if ( parent ) + if (parent) return FALSE; - if ( n >= spreadsheetModel->spreadsheet->sheets) + if (n >= spreadsheetModel->spreadsheet->n_sheets) return FALSE; iter->stamp = spreadsheetModel->stamp; - iter->user_data = (gpointer) n; + iter->user_data = (gpointer) (intptr_t) n; return TRUE; } static gint -tree_model_n_children (GtkTreeModel *model, - GtkTreeIter *iter) +tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter) { - PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model); + PsppireSpreadsheetModel *spreadsheetModel = + PSPPIRE_SPREADSHEET_MODEL (model); - if ( iter == NULL ) - return spreadsheetModel->spreadsheet->sheets; + if (iter == NULL) + return spreadsheetModel->spreadsheet->n_sheets; return 0; } static gboolean -tree_model_iter_has_child (GtkTreeModel *tree_model, - GtkTreeIter *iter) +tree_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter) { return FALSE; } static GtkTreePath * -tree_model_get_path (GtkTreeModel *model, GtkTreeIter *iter) +tree_model_get_path (GtkTreeModel * model, GtkTreeIter * iter) { - PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model); + PsppireSpreadsheetModel *spreadsheetModel = + PSPPIRE_SPREADSHEET_MODEL (model); GtkTreePath *path; - gint index = (gint) iter->user_data; + gint index = (intptr_t) iter->user_data; g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, NULL); @@ -313,9 +342,24 @@ tree_model_get_path (GtkTreeModel *model, GtkTreeIter *iter) } +static gboolean +tree_model_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent) +{ + PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model); + + if (parent != NULL) + return FALSE; + + iter->stamp = spreadsheetModel->stamp; + iter->user_data = 0; + + return TRUE; +} + + static void -spreadsheet_tree_model_init (GtkTreeModelIface *iface) +spreadsheet_tree_model_init (GtkTreeModelIface * iface) { iface->get_flags = tree_model_get_flags; iface->get_n_columns = tree_model_n_columns; @@ -324,11 +368,11 @@ spreadsheet_tree_model_init (GtkTreeModelIface *iface) iface->iter_next = tree_model_iter_next; iface->get_value = tree_model_get_value; - iface->iter_children = NULL; + iface->iter_children = tree_model_children; iface->iter_parent = NULL; iface->get_path = tree_model_get_path; - iface->iter_has_child = tree_model_iter_has_child ; - iface->iter_n_children = tree_model_n_children ; - iface->iter_nth_child = tree_model_nth_child ; + iface->iter_has_child = tree_model_iter_has_child; + iface->iter_n_children = tree_model_n_children; + iface->iter_nth_child = tree_model_nth_child; }