X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=9e2190b2909e181475309ed1c58e10b3ce304872;hb=45fb19608ffa759f7a0221878d1a9a72c6727dc7;hp=8560c223f1236b0b7de9d4904b55c4e1b0358b3e;hpb=2bdde1cd21cd58349cf4bd852fddf40524854288;p=pspp-builds.git diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index 8560c223..9e2190b2 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2006, 2007 Free Software Foundation + Copyright (C) 2004, 2006, 2007, 2009 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 @@ -19,18 +19,36 @@ #include #include -#include +#include +#include "psppire-var-ptr.h" #include "psppire-dict.h" -#include #include #include #include #include +#include #include "helper.h" #include "message-dialog.h" + +enum { + BACKEND_CHANGED, + + VARIABLE_CHANGED, + VARIABLE_RESIZED, + VARIABLE_INSERTED, + VARIABLE_DELETED, + VARIABLE_DISPLAY_WIDTH_CHANGED, + + WEIGHT_CHANGED, + FILTER_CHANGED, + SPLIT_CHANGED, + n_SIGNALS +}; + + /* --- prototypes --- */ static void psppire_dict_class_init (PsppireDictClass *class); static void psppire_dict_init (PsppireDict *dict); @@ -42,15 +60,6 @@ static void dictionary_tree_model_init (GtkTreeModelIface *iface); /* --- variables --- */ static GObjectClass *parent_class = NULL; -enum {VARIABLE_CHANGED, - VARIABLE_RESIZED, - VARIABLE_INSERTED, - VARIABLE_DELETED, - WEIGHT_CHANGED, - FILTER_CHANGED, - SPLIT_CHANGED, - n_SIGNALS}; - static guint signals [n_SIGNALS]; /* --- functions --- */ @@ -89,8 +98,6 @@ psppire_dict_get_type (void) g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL, &tree_model_info); - - } return object_type; @@ -106,6 +113,17 @@ psppire_dict_class_init (PsppireDictClass *class) object_class->finalize = psppire_dict_finalize; + signals [BACKEND_CHANGED] = + g_signal_new ("backend-changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + signals [VARIABLE_CHANGED] = g_signal_new ("variable_changed", G_TYPE_FROM_CLASS (class), @@ -137,7 +155,7 @@ psppire_dict_class_init (PsppireDictClass *class) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - marshaller_VOID__INT_INT_INT, + psppire_marshal_VOID__INT_INT_INT, G_TYPE_NONE, 3, G_TYPE_INT, @@ -151,12 +169,23 @@ psppire_dict_class_init (PsppireDictClass *class) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - gtkextra_VOID__INT_INT, + psppire_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); + signals [VARIABLE_DISPLAY_WIDTH_CHANGED] = + g_signal_new ("variable-display-width-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 [WEIGHT_CHANGED] = g_signal_new ("weight-changed", @@ -208,15 +237,17 @@ psppire_dict_finalize (GObject *object) static void addcb (struct dictionary *d, int idx, void *pd) { - g_signal_emit (pd, signals [VARIABLE_INSERTED], 0, idx); + PsppireDict *dict = PSPPIRE_DICT (pd); + + if ( ! dict->disable_insert_signal) + g_signal_emit (dict, signals [VARIABLE_INSERTED], 0, idx); } static void -delcb (struct dictionary *d, int dict_idx, int case_idx, int value_cnt, - void *pd) +delcb (struct dictionary *d, int dict_idx, int case_idx, int width, void *pd) { g_signal_emit (pd, signals [VARIABLE_DELETED], 0, - dict_idx, case_idx, value_cnt ); + dict_idx, case_idx, width ); } static void @@ -226,9 +257,9 @@ mutcb (struct dictionary *d, int idx, void *pd) } static void -resize_cb (struct dictionary *d, int idx, int delta, void *pd) +resize_cb (struct dictionary *d, int idx, int old_width, void *pd) { - g_signal_emit (pd, signals [VARIABLE_RESIZED], 0, idx, delta); + g_signal_emit (pd, signals [VARIABLE_RESIZED], 0, idx, old_width); } static void @@ -249,6 +280,13 @@ split_changed_callback (struct dictionary *d, void *pd) g_signal_emit (pd, signals [SPLIT_CHANGED], 0); } +static void +variable_display_width_callback (struct dictionary *d, int idx, void *pd) +{ + g_signal_emit (pd, signals [VARIABLE_DISPLAY_WIDTH_CHANGED], 0, idx); +} + + static const struct dict_callbacks gui_callbacks = { @@ -258,13 +296,15 @@ static const struct dict_callbacks gui_callbacks = resize_cb, weight_changed_callback, filter_changed_callback, - split_changed_callback + split_changed_callback, + variable_display_width_callback }; static void psppire_dict_init (PsppireDict *psppire_dict) { psppire_dict->stamp = g_random_int (); + psppire_dict->disable_insert_signal = FALSE; } /** @@ -276,7 +316,7 @@ psppire_dict_init (PsppireDict *psppire_dict) PsppireDict* psppire_dict_new_from_dict (struct dictionary *d) { - PsppireDict *new_dict = g_object_new (G_TYPE_PSPPIRE_DICT, NULL); + PsppireDict *new_dict = g_object_new (PSPPIRE_TYPE_DICT, NULL); new_dict->dict = d; dict_set_callbacks (new_dict->dict, &gui_callbacks, new_dict); @@ -289,6 +329,7 @@ void psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d) { struct variable *var = dict_get_weight (d); + dict->dict = d; weight_changed_callback (d, var ? var_get_dict_index (var) : -1, dict); @@ -299,6 +340,8 @@ psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d) split_changed_callback (d, dict); dict_set_callbacks (dict->dict, &gui_callbacks, dict); + + g_signal_emit (dict, signals [BACKEND_CHANGED], 0); } @@ -331,9 +374,15 @@ psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name) if ( ! name ) name = auto_generate_var_name (d); + d->disable_insert_signal = TRUE; + var = dict_create_var (d->dict, name, 0); dict_reorder_var (d->dict, var, idx); + + d->disable_insert_signal = FALSE; + + g_signal_emit (d, signals[VARIABLE_INSERTED], 0, idx); } /* Delete N variables beginning at FIRST */ @@ -386,7 +435,9 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name) -/* Return the IDXth variable */ +/* Return the IDXth variable. + Will return NULL if IDX exceeds the number of variables in the dictionary. + */ struct variable * psppire_dict_get_variable (const PsppireDict *d, gint idx) { @@ -422,6 +473,17 @@ psppire_dict_get_value_cnt (const PsppireDict *d) } +/* Returns the prototype for the cases that match the dictionary */ +const struct caseproto * +psppire_dict_get_proto (const PsppireDict *d) +{ + g_return_val_if_fail (d, NULL); + g_return_val_if_fail (d->dict, NULL); + + return dict_get_proto (d->dict); +} + + /* Return a variable by name. Return NULL if it doesn't exist */ @@ -469,7 +531,7 @@ psppire_dict_check_name (const PsppireDict *dict, } -inline gint +gint psppire_dict_get_next_value_idx (const PsppireDict *dict) { return dict_get_next_value_idx (dict->dict); @@ -480,17 +542,14 @@ void psppire_dict_resize_variable (PsppireDict *d, const struct variable *pv, gint old_size, gint new_size) { - gint fv; g_return_if_fail (d); g_return_if_fail (d->dict); if ( old_size == new_size ) return ; - fv = var_get_case_index (pv); - g_signal_emit (d, signals [VARIABLE_RESIZED], 0, - fv + old_size, + var_get_dict_index (pv), new_size - old_size ); } @@ -590,7 +649,7 @@ tree_model_column_type (GtkTreeModel *model, gint index) return G_TYPE_STRING; break; case DICT_TVM_COL_VAR: - return G_TYPE_POINTER; + return PSPPIRE_VAR_PTR_TYPE; break; default: g_return_val_if_reached ((GType)0); @@ -702,15 +761,13 @@ tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, { 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); + g_value_init (value, G_TYPE_STRING); + g_value_set_string (value, var_get_name (var)); } break; case DICT_TVM_COL_VAR: - g_value_init (value, G_TYPE_POINTER); - g_value_set_pointer (value, var); + g_value_init (value, PSPPIRE_VAR_PTR_TYPE); + g_value_set_boxed (value, var); break; default: g_return_if_reached (); @@ -771,6 +828,10 @@ psppire_dict_rename_var (PsppireDict *dict, struct variable *v, if ( ! var_is_valid_name (name, false)) return FALSE; + /* Make sure no other variable has this name */ + if ( NULL != psppire_dict_lookup_var (dict, name)) + return FALSE; + dict_rename_var (dict->dict, v, name); return TRUE; @@ -796,12 +857,20 @@ psppire_dict_dump (const PsppireDict *dict) { const struct variable *v = psppire_dict_get_variable (dict, i); int di = var_get_dict_index (v); - g_print ("\"%s\" idx=%d, fv=%d, size=%d\n", + g_print ("\"%s\" idx=%d, fv=%d\n", var_get_name(v), di, - var_get_case_index(v), - value_cnt_from_width(var_get_width(v))); + var_get_case_index(v)); } } #endif + + + + +const gchar * +psppire_dict_encoding (const PsppireDict *dict) +{ + return dict_get_encoding (dict->dict); +}