enum {
VARIABLE_CHANGED,
VARIABLE_INSERTED,
- VARIABLE_DELETED,
+ VARIABLES_DELETED,
+ VARIABLE_MOVED,
WEIGHT_CHANGED,
FILTER_CHANGED,
/* --- prototypes --- */
-static void psppire_dict_class_init (PsppireDictClass *class);
-static void psppire_dict_init (PsppireDict *dict);
static void psppire_dict_dispose (GObject *object);
static void dictionary_tree_model_init (GtkTreeModelIface *iface);
{
PsppireDict *dict = PSPPIRE_DICT (list);
- return psppire_dict_get_var_cnt (dict);
+ return psppire_dict_get_n_vars (dict);
}
static GType
PsppireDict *dict = PSPPIRE_DICT (list);
- if (id >= psppire_dict_get_var_cnt (dict))
+ if (id >= psppire_dict_get_n_vars (dict))
{
gtk_button_set_label (GTK_BUTTON (button), _("Var"));
}
static guint signals [n_SIGNALS];
/* --- functions --- */
-/**
- * psppire_dict_get_type:
- * @returns: the type ID for accelerator groups.
- */
-GType
-psppire_dict_get_type (void)
-{
- static GType object_type = 0;
-
- if (!object_type)
- {
- static const GTypeInfo object_info = {
- sizeof (PsppireDictClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) psppire_dict_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (PsppireDict),
- 0, /* n_preallocs */
- (GInstanceInitFunc) psppire_dict_init,
- };
-
- static const GInterfaceInfo tree_model_info = {
- (GInterfaceInitFunc) dictionary_tree_model_init,
- NULL,
- NULL
- };
-
- static const GInterfaceInfo list_model_info = {
- (GInterfaceInitFunc) ssw_init_iface,
- 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);
-
- g_type_add_interface_static (object_type, G_TYPE_LIST_MODEL,
- &list_model_info);
- }
-
- return object_type;
-}
+G_DEFINE_TYPE_WITH_CODE (PsppireDict, psppire_dict, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+ dictionary_tree_model_init)
+ G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+ ssw_init_iface))
static void
psppire_dict_class_init (PsppireDictClass *class)
1,
G_TYPE_INT);
- signals [VARIABLE_DELETED] =
- g_signal_new ("variable-deleted",
+ signals [VARIABLES_DELETED] =
+ g_signal_new ("variables-deleted",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
- psppire_marshal_VOID__POINTER_INT_INT,
+ psppire_marshal_VOID__INT_UINT,
G_TYPE_NONE,
- 3,
- G_TYPE_POINTER,
+ 2,
G_TYPE_INT,
- G_TYPE_INT);
+ G_TYPE_UINT);
+
+ signals [VARIABLE_MOVED] =
+ g_signal_new ("variable-moved",
+ G_TYPE_FROM_CLASS (class),
+ G_SIGNAL_RUN_FIRST,
+ 0,
+ NULL, NULL,
+ psppire_marshal_VOID__INT_INT,
+ G_TYPE_NONE,
+ 2,
+ G_TYPE_INT,
+ G_TYPE_INT);
signals [WEIGHT_CHANGED] =
g_signal_new ("weight-changed",
{
PsppireDict *d = PSPPIRE_DICT (object);
+ if (!d->dispose_has_run)
+ return;
+
+ d->dispose_has_run = TRUE;
+
dict_set_callbacks (d->dict, NULL, NULL);
dict_unref (d->dict);
/* Pass on callbacks from src/data/dictionary, as
signals in the Gtk library */
static void
-addcb (struct dictionary *d, int idx, void *pd)
+var_added_callback (struct dictionary *d, int idx, void *pd)
{
PsppireDict *dict = PSPPIRE_DICT (pd);
}
static void
-delcb (struct dictionary *d, const struct variable *var,
- int dict_idx, int case_idx, void *pd)
+vars_deleted_callback (struct dictionary *d, int dict_idx, unsigned int n, void *pd)
{
- g_signal_emit (pd, signals [VARIABLE_DELETED], 0,
- var, dict_idx, case_idx);
+ g_signal_emit (pd, signals [VARIABLES_DELETED], 0, dict_idx, n);
g_signal_emit_by_name (pd, "items-changed", dict_idx, 1, 0);
}
static void
-mutcb (struct dictionary *d, int idx, unsigned int what, const struct variable *oldvar, void *pd)
+var_moved_callback (struct dictionary *d, int new_dict_index, int old_dict_index, void *pd)
+{
+ g_signal_emit (pd, signals [VARIABLE_MOVED], 0, new_dict_index, old_dict_index);
+}
+
+static void
+var_changed_callback (struct dictionary *d, int idx, unsigned int what, const struct variable *oldvar, void *pd)
{
g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx, what, oldvar);
g_signal_emit_by_name (pd, "items-changed", idx, 1, 1);
static const struct dict_callbacks gui_callbacks =
{
- addcb,
- delcb,
- mutcb,
- weight_changed_callback,
- filter_changed_callback,
- split_changed_callback
+ .var_added = var_added_callback,
+ .vars_deleted = vars_deleted_callback,
+ .var_moved = var_moved_callback,
+ .var_changed = var_changed_callback,
+ .weight_changed = weight_changed_callback,
+ .filter_changed = filter_changed_callback,
+ .split_changed = split_changed_callback
};
static void
-psppire_dict_init (PsppireDict *psppire_dict)
+psppire_dict_init (PsppireDict *d)
{
- psppire_dict->stamp = g_random_int ();
- psppire_dict->disable_insert_signal = FALSE;
+ d->dispose_has_run = FALSE;
+
+ d->stamp = g_random_int ();
+ d->disable_insert_signal = FALSE;
}
/**
struct dictionary *old_dict = dict->dict;
- guint old_n = dict_get_var_cnt (dict->dict);
- guint new_n = dict_get_var_cnt (d);
+ guint old_n = dict_get_n_vars (dict->dict);
+ guint new_n = dict_get_n_vars (d);
dict->dict = dict_ref (d);
dict_unref (old_dict);
void
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 (PSPPIRE_IS_DICT (d));
- size_t varcnt = dict_get_var_cnt (d->dict);
+ size_t varcnt = dict_get_n_vars (d->dict);
g_return_if_fail (first < varcnt);
g_return_if_fail (first >= 0);
g_return_if_fail (n > 0);
gboolean
psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
{
- struct variable *var;
g_assert (d);
g_assert (PSPPIRE_IS_DICT (d));
- if (! dict_id_is_valid (d->dict, name, false))
+ if (! dict_id_is_valid (d->dict, name))
return FALSE;
- if (idx < dict_get_var_cnt (d->dict))
+ if (idx < dict_get_n_vars (d->dict))
{
/* This is an existing variable? */
- var = dict_get_var (d->dict, idx);
+ struct variable * var = dict_get_var (d->dict, idx);
dict_rename_var (d->dict, var, name);
}
else
g_return_val_if_fail (d, NULL);
g_return_val_if_fail (d->dict, NULL);
- if (dict_get_var_cnt (d->dict) <= idx)
+ if (dict_get_n_vars (d->dict) <= idx)
return NULL;
return dict_get_var (d->dict, idx);
/* Return the number of variables in the dictionary */
gint
-psppire_dict_get_var_cnt (const PsppireDict *d)
+psppire_dict_get_n_vars (const PsppireDict *d)
{
g_return_val_if_fail (d, -1);
g_return_val_if_fail (d->dict, -1);
- return dict_get_var_cnt (d->dict);
-}
-
-
-/* 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 dict_get_n_vars (d->dict);
}
/* Return true if 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 (! dict_id_is_valid (dict->dict, name, report))
- return FALSE;
-
- if (psppire_dict_lookup_var (dict, name))
- {
- if (report)
- msg (ME, _("Duplicate variable name."));
- return FALSE;
- }
-
- return TRUE;
-}
-
-
-gint
-psppire_dict_get_next_value_idx (const PsppireDict *dict)
+ const gchar *name)
{
- return dict_get_next_value_idx (dict->dict);
+ return (dict_id_is_valid (dict->dict, name)
+ && !psppire_dict_lookup_var (dict, name));
}
-
/* Tree Model Stuff */
static GtkTreeModelFlags tree_model_get_flags (GtkTreeModel *model);
n = indices [0];
- if (n < 0 || n >= psppire_dict_get_var_cnt (dict))
+ if (n < 0 || n >= psppire_dict_get_n_vars (dict))
{
iter->stamp = 0;
iter->user_data = NULL;
idx = var_get_dict_index (var);
- if (idx + 1 >= psppire_dict_get_var_cnt (dict))
+ if (idx + 1 >= psppire_dict_get_n_vars (dict))
{
iter->user_data = NULL;
iter->stamp = 0;
return path;
}
-const struct fmt_spec *var_get_write_format (const struct variable *);
+struct fmt_spec var_get_write_format (const struct variable *);
static void
tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter,
var = iter->user_data;
- const struct fmt_spec *fs = var_get_write_format (var);
+ struct fmt_spec fs = var_get_write_format (var);
switch (column)
{
break;
case DICT_TVM_COL_WIDTH:
g_value_init (value, G_TYPE_INT);
- g_value_set_int (value, fs->w);
+ g_value_set_int (value, fs.w);
break;
case DICT_TVM_COL_DECIMAL:
g_value_init (value, G_TYPE_INT);
- g_value_set_int (value, fs->d);
+ g_value_set_int (value, fs.d);
break;
case DICT_TVM_COL_LABEL:
g_value_init (value, G_TYPE_STRING);
PsppireDict *dict = PSPPIRE_DICT (model);
if (iter == NULL)
- return psppire_dict_get_var_cnt (dict);
+ return psppire_dict_get_n_vars (dict);
return 0;
}
if (parent)
return FALSE;
- if (n >= psppire_dict_get_var_cnt (dict))
+ if (n >= psppire_dict_get_n_vars (dict))
return FALSE;
iter->stamp = dict->stamp;
psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
const gchar *name)
{
- if (! dict_id_is_valid (dict->dict, name, false))
+ if (! dict_id_is_valid (dict->dict, name))
return FALSE;
/* Make sure no other variable has this name */
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\n",
- var_get_name(v),
- di,
- var_get_case_index(v));
-
- }
-}
-#endif
-
-
const gchar *
psppire_dict_encoding (const PsppireDict *dict)
{
projects / pspp / blobdiff