X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=564257f46c8cdb74c6adef8ce6d4547f0bd70764;hb=9a331fe64eb814ae5c1322e21717a04fb254bf65;hp=31761136f8654601906ccd050aec107e8f59280f;hpb=f514231dd2fc0c2adc1ebab5c46a4b55d2bd9c2b;p=pspp-builds.git diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index 31761136..564257f4 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -19,10 +19,9 @@ #include #include -#include +#include #include "psppire-dict.h" -#include #include #include #include @@ -31,6 +30,23 @@ #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 +58,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 +96,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 +111,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 +153,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 +167,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,7 +235,10 @@ 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 @@ -249,6 +279,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 +295,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 +315,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 +328,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 +339,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 +373,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 +434,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) { @@ -411,6 +461,17 @@ psppire_dict_get_var_cnt (const PsppireDict *d) } +/* Return the number of `union value's in the dictionary */ +size_t +psppire_dict_get_value_cnt (const PsppireDict *d) +{ + g_return_val_if_fail (d, -1); + g_return_val_if_fail (d->dict, -1); + + return dict_get_next_value_idx (d->dict); +} + + /* Return a variable by name. Return NULL if it doesn't exist */ @@ -458,7 +519,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); @@ -760,6 +821,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; @@ -781,17 +846,14 @@ psppire_dict_dump (const PsppireDict *dict) gint i; const struct dictionary *d = dict->dict; - int *map = dict_get_compacted_dict_index_to_case_index (d); - for (i = 0; i < dict_get_var_cnt (d); ++i) { const struct variable *v = psppire_dict_get_variable (dict, i); int di = var_get_dict_index (v); - g_print ("\"%s\" idx=%d, fv=%d(%d), size=%d\n", + g_print ("\"%s\" idx=%d, fv=%d, size=%d\n", var_get_name(v), di, var_get_case_index(v), - map[di], value_cnt_from_width(var_get_width(v))); }