X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-spreadsheet-model.c;h=26c803f3a670a90d3923db358422e3a78c209634;hb=refs%2Fheads%2Fctables7;hp=d426b556616d143870eb6f0ce096894425b1d3f8;hpb=6e097c89af440da90b43ce90864394c4d0c843d5;p=pspp diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c index d426b55661..26c803f3a6 100644 --- a/src/ui/gui/psppire-spreadsheet-model.c +++ b/src/ui/gui/psppire-spreadsheet-model.c @@ -33,57 +33,18 @@ #include "psppire-spreadsheet-model.h" #include "data/spreadsheet-reader.h" - -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 GObjectClass *parent_class = NULL; - static void spreadsheet_tree_model_init (GtkTreeModelIface * iface); - -GType -psppire_spreadsheet_model_get_type (void) -{ - static GType object_type = 0; - - if (!object_type) - { - 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 */ - sizeof (PsppireSpreadsheetModel), - 0, - (GInstanceInitFunc) psppire_spreadsheet_model_init, - }; - - static const GInterfaceInfo tree_model_info = { - (GInterfaceInitFunc) spreadsheet_tree_model_init, - NULL, - NULL - }; - - object_type = g_type_register_static (G_TYPE_OBJECT, - "PsppireSpreadsheetModel", - &spreadsheet_model_info, 0); - - g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL, - &tree_model_info); - } - - return object_type; -} - +G_DEFINE_TYPE_WITH_CODE (PsppireSpreadsheetModel,\ + psppire_spreadsheet_model,\ + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, + spreadsheet_tree_model_init)) /* Properties */ enum @@ -105,8 +66,12 @@ psppire_spreadsheet_model_set_property (GObject * object, switch (prop_id) { case PROP_SPREADSHEET: - spreadsheetModel->spreadsheet = g_value_get_pointer (value); - spreadsheet_ref (spreadsheetModel->spreadsheet); + { + struct spreadsheet *old = spreadsheetModel->spreadsheet; + spreadsheetModel->spreadsheet = spreadsheet_ref (g_value_get_pointer (value)); + if (old) + spreadsheet_unref (old); + } break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -137,7 +102,7 @@ psppire_spreadsheet_model_finalize (GObject * object) static void psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass * class) { - GObjectClass *object_class; + GObjectClass *object_class = G_OBJECT_CLASS (class); GParamSpec *spreadsheet_spec = g_param_spec_pointer ("spreadsheet", "Spreadsheet", @@ -146,7 +111,7 @@ psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass * class) | G_PARAM_WRITABLE); parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass *) class; + object_class->set_property = psppire_spreadsheet_model_set_property; @@ -197,6 +162,9 @@ 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 < PSPPIRE_SPREADSHEET_MODEL_N_COLS, (GType) 0); + if (index == PSPPIRE_SPREADSHEET_MODEL_COL_SHEET_ROWS) + return G_TYPE_UINT; + return G_TYPE_STRING; } @@ -229,21 +197,19 @@ tree_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter, static gboolean tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) { - PsppireSpreadsheetModel *spreadsheetModel = - PSPPIRE_SPREADSHEET_MODEL (model); + PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model); + g_assert (iter); g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, FALSE); - if (iter == NULL) - return FALSE; - - if ((intptr_t) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1) + if ((intptr_t) iter->user_data >= + spreadsheet_get_sheet_n_sheets (spreadsheetModel->spreadsheet) - 1) { iter->user_data = NULL; iter->stamp = 0; return FALSE; } - iter->user_data++; + iter->user_data = GINT_TO_POINTER (GPOINTER_TO_INT (iter->user_data) + 1); return TRUE; } @@ -258,11 +224,11 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter, 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 PSPPIRE_SPREADSHEET_MODEL_COL_NAME: { + g_value_init (value, G_TYPE_STRING); const char *x = spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet, (intptr_t) iter->user_data); @@ -272,6 +238,7 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter, break; case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE: { + g_value_init (value, G_TYPE_STRING); char *x = spreadsheet_get_sheet_range (spreadsheetModel->spreadsheet, (intptr_t) iter->user_data); @@ -280,6 +247,26 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter, g_free (x); } break; + case PSPPIRE_SPREADSHEET_MODEL_COL_SHEET_ROWS: + { + g_value_init (value, G_TYPE_UINT); + unsigned int rows = + spreadsheet_get_sheet_n_rows (spreadsheetModel->spreadsheet, + (intptr_t) iter->user_data); + + g_value_set_uint (value, rows); + } + break; + case PSPPIRE_SPREADSHEET_MODEL_COL_SHEET_COLUMNS: + { + g_value_init (value, G_TYPE_UINT); + unsigned int columns = + spreadsheet_get_sheet_n_columns (spreadsheetModel->spreadsheet, + (intptr_t) iter->user_data); + + g_value_set_uint (value, columns); + } + break; default: g_error ("%s:%d Invalid column in spreadsheet model", __FILE__, __LINE__); @@ -297,7 +284,7 @@ tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter, if (parent) return FALSE; - if (n >= spreadsheetModel->spreadsheet->n_sheets) + if (n >= spreadsheet_get_sheet_n_sheets (spreadsheetModel->spreadsheet)) return FALSE; iter->stamp = spreadsheetModel->stamp; @@ -313,7 +300,7 @@ tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter) PSPPIRE_SPREADSHEET_MODEL (model); if (iter == NULL) - return spreadsheetModel->spreadsheet->n_sheets; + return spreadsheet_get_sheet_n_sheets (spreadsheetModel->spreadsheet); return 0; }