X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=4572ba0b6ef7bff91ec0026995b29676c7257fab;hb=c94183521bb50d92ae05153f6013af0bc347299e;hp=3e37343b7d10b141bb5aebcf7a1d13b27897b466;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index 3e37343b..4572ba0b 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, - VARIABLES_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), @@ -131,15 +147,16 @@ psppire_dict_class_init (PsppireDictClass *class) G_TYPE_INT); - signals [VARIABLES_DELETED] = - g_signal_new ("variables_deleted", + signals [VARIABLE_DELETED] = + g_signal_new ("variable-deleted", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - gtkextra_VOID__INT_INT, + psppire_marshal_VOID__INT_INT_INT, G_TYPE_NONE, - 2, + 3, + G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); @@ -150,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", @@ -207,13 +235,18 @@ 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 idx, void *pd) +delcb (struct dictionary *d, int dict_idx, int case_idx, int value_cnt, + void *pd) { - g_signal_emit (pd, signals [VARIABLES_DELETED], 0, idx, 1); + g_signal_emit (pd, signals [VARIABLE_DELETED], 0, + dict_idx, case_idx, value_cnt ); } static void @@ -222,6 +255,12 @@ mutcb (struct dictionary *d, int idx, void *pd) g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx); } +static void +resize_cb (struct dictionary *d, int idx, int delta, void *pd) +{ + g_signal_emit (pd, signals [VARIABLE_RESIZED], 0, idx, delta); +} + static void weight_changed_callback (struct dictionary *d, int idx, void *pd) { @@ -240,21 +279,31 @@ 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 = { addcb, delcb, mutcb, + 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; } /** @@ -279,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); @@ -289,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); } @@ -321,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 */ @@ -346,7 +404,6 @@ psppire_dict_delete_variables (PsppireDict *d, gint first, gint n) var = dict_get_var (d->dict, first); dict_delete_var (d->dict, var); } - dict_compact_values (d->dict); } @@ -402,6 +459,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 */ @@ -449,7 +517,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); @@ -467,8 +535,6 @@ psppire_dict_resize_variable (PsppireDict *d, const struct variable *pv, if ( old_size == new_size ) return ; - dict_compact_values (d->dict); - fv = var_get_case_index (pv); g_signal_emit (d, signals [VARIABLE_RESIZED], 0, @@ -753,6 +819,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; @@ -764,3 +834,26 @@ psppire_dict_get_weight_variable (const PsppireDict *dict) { return dict_get_weight (dict->dict); } + + + +#if DEBUGGING +void +psppire_dict_dump (const PsppireDict *dict) +{ + gint i; + const struct dictionary *d = dict->dict; + + 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, size=%d\n", + var_get_name(v), + di, + var_get_case_index(v), + value_cnt_from_width(var_get_width(v))); + + } +} +#endif