X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=42025f2dc7598fe50f9cdb5dcff30f816ab14952;hb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;hp=d5ea9094175f2c429cd1b378205120d9d2a27d52;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index d5ea9094..42025f2d 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -1,58 +1,60 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP - Copyright (C) 2004, 2006 Free Software Foundation - Written by John Darrington - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ - - +/* + PSPPIRE --- A Graphical User Interface for PSPP + Copyright (C) 2004, 2006, 2007 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ + +#include #include #include -#include "gtkextra-marshal.c" +#include +#include -#include "psppire-object.h" #include "psppire-dict.h" -#include "format.h" -#include "dictionary.h" -#include "missing-values.h" -#include "value-labels.h" - +#include +#include +#include +#include +#include +#include "helper.h" #include "message-dialog.h" -#include "psppire-variable.h" /* --- prototypes --- */ static void psppire_dict_class_init (PsppireDictClass *class); static void psppire_dict_init (PsppireDict *dict); static void psppire_dict_finalize (GObject *object); +static void dictionary_tree_model_init (GtkTreeModelIface *iface); + /* --- variables --- */ static GObjectClass *parent_class = NULL; -enum {VARIABLE_CHANGED, +enum {VARIABLE_CHANGED, + VARIABLE_RESIZED, VARIABLE_INSERTED, - VARIABLE_DELETED, - VARIABLES_DELETED, + VARIABLES_DELETED, + WEIGHT_CHANGED, + FILTER_CHANGED, + SPLIT_CHANGED, n_SIGNALS}; -static guint signal[n_SIGNALS]; - -#define CACHE_CHUNK 5 +static guint signals [n_SIGNALS]; /* --- functions --- */ /** @@ -78,8 +80,20 @@ psppire_dict_get_type (void) (GInstanceInitFunc) psppire_dict_init, }; - object_type = g_type_register_static (G_TYPE_PSPPIRE_OBJECT, "PsppireDict", + static const GInterfaceInfo tree_model_info = { + (GInterfaceInitFunc) dictionary_tree_model_init, + NULL, + NULL + }; + + object_type = g_type_register_static (G_TYPE_OBJECT, + "PsppireDict", &object_info, 0); + + g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL, + &tree_model_info); + + } return object_type; @@ -95,128 +109,192 @@ psppire_dict_class_init (PsppireDictClass *class) object_class->finalize = psppire_dict_finalize; - signal[VARIABLE_CHANGED] = + signals [VARIABLE_CHANGED] = g_signal_new ("variable_changed", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, + G_TYPE_NONE, 1, G_TYPE_INT); - signal[VARIABLE_INSERTED] = + signals [VARIABLE_INSERTED] = g_signal_new ("variable_inserted", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, + G_TYPE_NONE, 1, G_TYPE_INT); - signal[VARIABLE_DELETED] = - g_signal_new ("variable_deleted", - G_TYPE_FROM_CLASS(class), + + signals [VARIABLES_DELETED] = + g_signal_new ("variables_deleted", + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, - 1, + gtkextra_VOID__INT_INT, + G_TYPE_NONE, + 2, + G_TYPE_INT, G_TYPE_INT); - signal[VARIABLES_DELETED] = - g_signal_new ("variables_deleted", - G_TYPE_FROM_CLASS(class), + signals [VARIABLE_RESIZED] = + g_signal_new ("dict-size-changed", + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, gtkextra_VOID__INT_INT, - G_TYPE_NONE, + G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); + + signals [WEIGHT_CHANGED] = + g_signal_new ("weight-changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, + 1, + G_TYPE_INT); + + + signals [FILTER_CHANGED] = + g_signal_new ("filter-changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, + 1, + G_TYPE_INT); + + + signals [SPLIT_CHANGED] = + g_signal_new ("split-changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); } static void psppire_dict_finalize (GObject *object) { - gint v; PsppireDict *d = PSPPIRE_DICT (object); - + dict_destroy (d->dict); - for (v = 0 ; v < psppire_dict_get_var_cnt(d) ; ++v ) - g_free(d->variables[v]); + G_OBJECT_CLASS (parent_class)->finalize (object); +} - g_free(d->variables); - d->cache_size = 0; +/* Pass on callbacks from src/data/dictionary, as + signals in the Gtk library */ +static void +addcb (struct dictionary *d, int idx, void *pd) +{ + g_signal_emit (pd, signals [VARIABLE_INSERTED], 0, idx); +} - dict_destroy(d->dict); +static void +delcb (struct dictionary *d, int idx, void *pd) +{ + g_signal_emit (pd, signals [VARIABLES_DELETED], 0, idx, 1); +} - G_OBJECT_CLASS (parent_class)->finalize (object); +static void +mutcb (struct dictionary *d, int idx, void *pd) +{ + g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx); } static void -psppire_dict_init (PsppireDict *psppire_dict) +weight_changed_callback (struct dictionary *d, int idx, void *pd) { - psppire_dict->dict = dict_create(); + g_signal_emit (pd, signals [WEIGHT_CHANGED], 0, idx); +} - psppire_dict->variables = 0; - psppire_dict->cache_size = 0; +static void +filter_changed_callback (struct dictionary *d, int idx, void *pd) +{ + g_signal_emit (pd, signals [FILTER_CHANGED], 0, idx); } -/** - * psppire_dict_new: - * @returns: a new #PsppireDict object - * - * Creates a new #PsppireDict. - */ -PsppireDict* -psppire_dict_new (void) +static void +split_changed_callback (struct dictionary *d, void *pd) { - return g_object_new (G_TYPE_PSPPIRE_DICT, NULL); + g_signal_emit (pd, signals [SPLIT_CHANGED], 0); } +static const struct dict_callbacks gui_callbacks = + { + addcb, + delcb, + mutcb, + weight_changed_callback, + filter_changed_callback, + split_changed_callback + }; + +static void +psppire_dict_init (PsppireDict *psppire_dict) +{ + psppire_dict->stamp = g_random_int (); +} + /** * psppire_dict_new_from_dict: * @returns: a new #PsppireDict object - * - * Creates a new #PsppireDict. + * + * Creates a new #PsppireDict. */ PsppireDict* psppire_dict_new_from_dict (struct dictionary *d) { PsppireDict *new_dict = g_object_new (G_TYPE_PSPPIRE_DICT, NULL); new_dict->dict = d; - new_dict->cache_size = dict_get_var_cnt(d); - new_dict->variables = g_malloc0(sizeof(struct PsppireVariable *) * - new_dict->cache_size); + dict_set_callbacks (new_dict->dict, &gui_callbacks, new_dict); return new_dict; } +void +psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d) +{ + dict->dict = d; +} + + /* Returns a valid name for a new variable in DICT. The return value is statically allocated */ -static gchar * -auto_generate_var_name(PsppireDict *dict) +static gchar * +auto_generate_var_name (PsppireDict *dict) { gint d = 0; - static gchar name[255]; - + static gchar name[10]; - while (g_snprintf(name, 255, "VAR%05d",d++), - psppire_dict_lookup_var(dict, name)) + while (g_snprintf (name, 10, "VAR%05d",d++), + psppire_dict_lookup_var (dict, name)) ; return name; @@ -224,144 +302,92 @@ auto_generate_var_name(PsppireDict *dict) /* Insert a new variable at posn IDX, with the name NAME. If NAME is null, then a name will be automatically assigned. - */ +*/ void -psppire_dict_insert_variable(PsppireDict *d, gint idx, const gchar *name) +psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name) { - gint i; - g_return_if_fail(d); - g_return_if_fail(G_IS_PSPPIRE_DICT(d)); - - - /* Invalidate the cache from IDX onwards */ - for ( i = idx ; i < d->cache_size ; ++i ) - { - g_free(d->variables[i]); - d->variables[i] = 0; - } - - /* Ensure that the cache is large enough */ - if ( dict_get_var_cnt(d->dict) >= d->cache_size ) - { - d->variables = g_realloc(d->variables, sizeof(struct PsppireVariable*) * - (d->cache_size + CACHE_CHUNK)); - d->cache_size += CACHE_CHUNK; - } - - /* Zero the new pointers */ - for ( ; i < d->cache_size ; ++i ) - { - d->variables[i] = 0; - } + struct variable *var ; + g_return_if_fail (idx >= 0); + g_return_if_fail (d); + g_return_if_fail (PSPPIRE_IS_DICT (d)); - if ( ! name ) - name = auto_generate_var_name(d); - - struct variable *var = - dict_create_var(d->dict, name, 0); + if ( ! name ) + name = auto_generate_var_name (d); - dict_reorder_var(d->dict, var, idx); + var = dict_create_var (d->dict, name, 0); - - d->variables[idx] = g_malloc(sizeof (struct PsppireVariable)); - d->variables[idx]->v = var; - d->variables[idx]->dict = d; - - g_signal_emit(d, signal[VARIABLE_INSERTED], 0, idx ); + dict_reorder_var (d->dict, var, idx); } /* Delete N variables beginning at FIRST */ void -psppire_dict_delete_variables(PsppireDict *d, gint first, gint n) +psppire_dict_delete_variables (PsppireDict *d, gint first, gint n) { gint idx; - g_return_if_fail(d); - g_return_if_fail(d->dict); - g_return_if_fail(G_IS_PSPPIRE_DICT(d)); - - /* Invalidate all pvs from FIRST onwards */ - for ( idx = first ; idx < d->cache_size ; ++idx ) - { - g_free(d->variables[idx]); - d->variables[idx] = 0; - } + g_return_if_fail (d); + g_return_if_fail (d->dict); + g_return_if_fail (PSPPIRE_IS_DICT (d)); - for (idx = 0 ; idx < n ; ++idx ) + for (idx = 0 ; idx < n ; ++idx ) { struct variable *var; /* Do nothing if it's out of bounds */ if ( first >= dict_get_var_cnt (d->dict)) - break; + break; - var = dict_get_var(d->dict, first); + var = dict_get_var (d->dict, first); dict_delete_var (d->dict, var); } - - g_signal_emit(d, signal[VARIABLES_DELETED], 0, first, idx ); + dict_compact_values (d->dict); } void -psppire_dict_set_name(PsppireDict* d, gint idx, const gchar *name) +psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name) { struct variable *var; - g_assert(d); - g_assert(G_IS_PSPPIRE_DICT(d)); + g_assert (d); + g_assert (PSPPIRE_IS_DICT (d)); - if ( idx < dict_get_var_cnt(d->dict)) + if ( idx < dict_get_var_cnt (d->dict)) { /* This is an existing variable? */ - var = dict_get_var(d->dict, idx); - dict_rename_var(d->dict, var, name); - g_signal_emit(d, signal[VARIABLE_CHANGED], 0, idx); + var = dict_get_var (d->dict, idx); + dict_rename_var (d->dict, var, name); } else { /* new variable */ - dict_create_var(d->dict, name, 0); - g_print("Emitting variable-inserted signal\n"); - g_signal_emit(d, signal[VARIABLE_INSERTED], 0, idx); + dict_create_var (d->dict, name, 0); } } /* Return the IDXth variable */ -struct PsppireVariable * -psppire_dict_get_variable(PsppireDict *d, gint idx) -{ - g_return_val_if_fail(d, NULL); - g_return_val_if_fail(d->dict, NULL); - g_return_val_if_fail(d->variables, NULL); - - if (idx < 0 || idx >= psppire_dict_get_var_cnt(d)) - return NULL; +struct variable * +psppire_dict_get_variable (const PsppireDict *d, gint idx) +{ + g_return_val_if_fail (d, NULL); + g_return_val_if_fail (d->dict, NULL); - struct PsppireVariable *var = d->variables[idx] ; + if ( dict_get_var_cnt (d->dict) <= idx ) + return NULL; - if (! var ) - { - var = g_malloc(sizeof (*var)); - var->dict = d; - var->v = dict_get_var(d->dict, idx); - d->variables[idx] = var; - } - - return var; + return dict_get_var (d->dict, idx); } /* Return the number of variables in the dictionary */ -gint -psppire_dict_get_var_cnt(const PsppireDict *d) +gint +psppire_dict_get_var_cnt (const PsppireDict *d) { - g_return_val_if_fail(d, -1); - g_return_val_if_fail(d->dict, -1); - + g_return_val_if_fail (d, -1); + g_return_val_if_fail (d->dict, -1); - return dict_get_var_cnt(d->dict); + return dict_get_var_cnt (d->dict); } @@ -371,63 +397,354 @@ psppire_dict_get_var_cnt(const PsppireDict *d) struct variable * psppire_dict_lookup_var (const PsppireDict *d, const gchar *name) { - g_return_val_if_fail(d, NULL); - g_return_val_if_fail(d->dict, NULL); + g_return_val_if_fail (d, NULL); + g_return_val_if_fail (d->dict, NULL); + + return dict_lookup_var (d->dict, name); +} + +/* Clears the contents of D */ +void +psppire_dict_clear (PsppireDict *d) +{ + g_return_if_fail (d); + g_return_if_fail (d->dict); - return dict_lookup_var(d->dict, name); + { + dict_clear (d->dict); + } +} + + +/* Return true is NAME would be a valid name of a variable to add to the + dictionary. False otherwise. + If REPORT is true, then invalid names will be reported as such as errors +*/ +gboolean +psppire_dict_check_name (const PsppireDict *dict, + const gchar *name, gboolean report) +{ + if ( ! var_is_valid_name (name, report ) ) + return FALSE; + + if (psppire_dict_lookup_var (dict, name)) + { + if ( report ) + msg (ME,"Duplicate variable name."); + return FALSE; + } + + return TRUE; +} + + +inline gint +psppire_dict_get_next_value_idx (const PsppireDict *dict) +{ + return dict_get_next_value_idx (dict->dict); } void -psppire_dict_var_changed(PsppireDict *d, gint idx) +psppire_dict_resize_variable (PsppireDict *d, const struct variable *pv, + gint old_size, gint new_size) { - g_return_if_fail(d); + gint fv; + g_return_if_fail (d); + g_return_if_fail (d->dict); + + if ( old_size == new_size ) + return ; - g_signal_emit(d, signal[VARIABLE_CHANGED], 0, idx); + dict_compact_values (d->dict); + + fv = var_get_case_index (pv); + + g_signal_emit (d, signals [VARIABLE_RESIZED], 0, + fv + old_size, + new_size - old_size ); } -/* Clears the contents of D */ -void -psppire_dict_clear(PsppireDict *d) +/* Tree Model Stuff */ + +static GtkTreeModelFlags tree_model_get_flags (GtkTreeModel *model); + +static gint tree_model_n_columns (GtkTreeModel *model); + +static GType tree_model_column_type (GtkTreeModel *model, gint index); + +static gboolean tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, + GtkTreePath *path); + +static gboolean tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter); + +static GtkTreePath * tree_model_get_path (GtkTreeModel *model, + GtkTreeIter *iter); + +static void tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, + gint column, GValue *value); + +static gboolean tree_model_nth_child (GtkTreeModel *model, GtkTreeIter *iter, + GtkTreeIter *parent, gint n); + +static gint tree_model_n_children (GtkTreeModel *tree_model, + GtkTreeIter *iter); + +static gboolean tree_model_iter_children (GtkTreeModel *, + GtkTreeIter *, + GtkTreeIter *); + +static gboolean tree_model_iter_parent (GtkTreeModel *tree_model, + GtkTreeIter *iter, + GtkTreeIter *child); + +static gboolean tree_model_iter_has_child (GtkTreeModel *tree_model, + GtkTreeIter *iter); + +static void +dictionary_tree_model_init (GtkTreeModelIface *iface) +{ + iface->get_flags = tree_model_get_flags; + iface->get_n_columns = tree_model_n_columns; + iface->get_column_type = tree_model_column_type; + iface->get_iter = tree_model_get_iter; + iface->iter_next = tree_model_iter_next; + iface->get_path = tree_model_get_path; + iface->get_value = tree_model_get_value; + + iface->iter_children = tree_model_iter_children ; + 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_parent = tree_model_iter_parent ; +} + +static gboolean +tree_model_iter_has_child (GtkTreeModel *tree_model, + GtkTreeIter *iter) +{ + return FALSE; +} + +static gboolean +tree_model_iter_parent (GtkTreeModel *tree_model, + GtkTreeIter *iter, + GtkTreeIter *child) +{ + return TRUE; +} + +static GtkTreeModelFlags +tree_model_get_flags (GtkTreeModel *model) { - g_return_if_fail(d); - g_return_if_fail(d->dict); + g_return_val_if_fail (PSPPIRE_IS_DICT (model), (GtkTreeModelFlags) 0); + + return GTK_TREE_MODEL_LIST_ONLY; +} - const gint n_vars = dict_get_var_cnt(d->dict); - gint i; - - dict_clear(d->dict); - /* Invalidate the entire cache */ - for ( i = 0 ; i < d->cache_size ; ++i ) +static gint +tree_model_n_columns (GtkTreeModel *model) +{ + return n_DICT_COLS; +} + +static GType +tree_model_column_type (GtkTreeModel *model, gint index) +{ + g_return_val_if_fail (PSPPIRE_IS_DICT (model), (GType) 0); + + switch (index) { - g_free(d->variables[i]); - d->variables[i] = 0; + case DICT_TVM_COL_NAME: + return G_TYPE_STRING; + break; + case DICT_TVM_COL_VAR: + return G_TYPE_POINTER; + break; + default: + g_return_val_if_reached ((GType)0); + break; } - g_signal_emit(d, signal[VARIABLES_DELETED], 0, 0, n_vars ); + g_assert_not_reached (); + return ((GType)0); } +static gboolean +tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path) +{ + gint *indices, depth; + gint n; + struct variable *var; + PsppireDict *dict = PSPPIRE_DICT (model); -/* Return true is NAME would be a valid name of a variable to add to the - dictionary. False otherwise. - If REPORT is true, then invalid names will be reported as such as errors -*/ -gboolean -psppire_dict_check_name(const PsppireDict *dict, - const gchar *name, gboolean report) -{ - if ( ! var_is_valid_name(name, report ) ) + g_return_val_if_fail (path, FALSE); + + indices = gtk_tree_path_get_indices (path); + depth = gtk_tree_path_get_depth (path); + + g_return_val_if_fail (depth == 1, FALSE); + + n = indices [0]; + + if ( n < 0 || n >= psppire_dict_get_var_cnt (dict)) + { + iter->stamp = 0; + iter->user_data = NULL; return FALSE; + } + + var = psppire_dict_get_variable (dict, n); + + g_assert (var_get_dict_index (var) == n); + + iter->stamp = dict->stamp; + iter->user_data = var; + + return TRUE; +} + + +static gboolean +tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) +{ + PsppireDict *dict = PSPPIRE_DICT (model); + struct variable *var; + gint idx; + + g_return_val_if_fail (iter->stamp == dict->stamp, FALSE); - if (psppire_dict_lookup_var(dict, name)) + if ( iter == NULL || iter->user_data == NULL) + return FALSE; + + var = iter->user_data; + + idx = var_get_dict_index (var); + + if ( idx + 1 >= psppire_dict_get_var_cnt (dict)) { - if ( report ) - msg(ME,"Duplicate variable name."); + iter->user_data = NULL; + iter->stamp = 0; return FALSE; } + var = psppire_dict_get_variable (dict, idx + 1); + + g_assert (var_get_dict_index (var) == idx + 1); + + iter->user_data = var; + + return TRUE; +} + +static GtkTreePath * +tree_model_get_path (GtkTreeModel *model, GtkTreeIter *iter) +{ + GtkTreePath *path; + struct variable *var; + PsppireDict *dict = PSPPIRE_DICT (model); + + g_return_val_if_fail (iter->stamp == dict->stamp, FALSE); + + var = iter->user_data; + + path = gtk_tree_path_new (); + gtk_tree_path_append_index (path, var_get_dict_index (var)); + + return path; +} + + +static void +tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, + gint column, GValue *value) +{ + struct variable *var; + PsppireDict *dict = PSPPIRE_DICT (model); + + g_return_if_fail (iter->stamp == dict->stamp); + + var = iter->user_data; + + switch (column) + { + case DICT_TVM_COL_NAME: + { + gchar *name = pspp_locale_to_utf8(var_get_name (var), -1, NULL); + g_value_init (value, G_TYPE_STRING); + g_value_set_string (value, name); + g_free (name); + } + break; + case DICT_TVM_COL_VAR: + g_value_init (value, G_TYPE_POINTER); + g_value_set_pointer (value, var); + break; + default: + g_return_if_reached (); + break; + } +} + +static gboolean +tree_model_iter_children (GtkTreeModel *tree_model, + GtkTreeIter *iter, + GtkTreeIter *parent) +{ + return FALSE; +} + +static gint +tree_model_n_children (GtkTreeModel *model, + GtkTreeIter *iter) +{ + PsppireDict *dict = PSPPIRE_DICT (model); + + if ( iter == NULL ) + return psppire_dict_get_var_cnt (dict); + + return 0; +} + +static gboolean +tree_model_nth_child (GtkTreeModel *model, GtkTreeIter *iter, + GtkTreeIter *parent, gint n) +{ + PsppireDict *dict; + + g_return_val_if_fail (PSPPIRE_IS_DICT (model), FALSE); + + dict = PSPPIRE_DICT (model); + + if ( parent ) + return FALSE; + + if ( n >= psppire_dict_get_var_cnt (dict) ) + return FALSE; + + iter->stamp = dict->stamp; + iter->user_data = psppire_dict_get_variable (dict, n); + + if ( !iter->user_data) + return FALSE; + return TRUE; } + + +void +psppire_dict_rename_var (PsppireDict *dict, struct variable *v, + const gchar *text) +{ + dict_rename_var (dict->dict, v, text); +} + + +struct variable * +psppire_dict_get_weight_variable (const PsppireDict *dict) +{ + return dict_get_weight (dict->dict); +}