/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation
+ Copyright (C) 2006, 2008, 2009, 2010, 2011, 2012,
+ 2013, 2016, 2017 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
#include <stdlib.h>
#include <gettext.h>
#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
+#define P_(msgid) msgid
#include <data/datasheet.h>
#include <data/data-out.h>
#include "xalloc.h"
#include "xmalloca.h"
-
+#include "value-variant.h"
static void psppire_data_store_init (PsppireDataStore *data_store);
static void psppire_data_store_class_init (PsppireDataStoreClass *class);
enum
{
ITEMS_CHANGED,
- CASES_DELETED,
- CASE_INSERTED,
CASE_CHANGED,
n_SIGNALS
};
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model);
+ if (store->datasheet == NULL)
+ return 0;
+
gint n = datasheet_get_n_rows (store->datasheet);
return n;
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model);
- return psppire_dict_get_value_cnt (store->dict);
+ return psppire_dict_get_var_cnt (store->dict);
}
gint n)
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model);
-
- g_assert (parent == NULL);
+ g_assert (parent == NULL);
g_return_val_if_fail (store, FALSE);
- g_return_val_if_fail (store->datasheet, FALSE);
- if (n >= datasheet_get_n_rows (store->datasheet))
+ if (!store->datasheet || n >= datasheet_get_n_rows (store->datasheet))
{
iter->stamp = -1;
iter->user_data = NULL;
return FALSE;
}
-
+
iter->user_data = GINT_TO_POINTER (n);
iter->stamp = store->stamp;
-
+
return TRUE;
}
+/* Set the contents of OUT to reflect the information provided by IN, COL, and
+ ROW, for MODEL. Returns TRUE if successful. */
+gboolean
+psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row,
+ const gchar *in, GValue *out)
+{
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+
+ while (col >= psppire_dict_get_var_cnt (store->dict))
+ {
+ const struct variable *var =
+ psppire_dict_insert_variable (store->dict,
+ psppire_dict_get_var_cnt (store->dict),
+ NULL);
+ g_return_val_if_fail (var, FALSE);
+ }
+
+ const struct variable *variable = psppire_dict_get_variable (store->dict, col);
+ g_return_val_if_fail (variable, FALSE);
+
+ const struct fmt_spec *fmt = var_get_print_format (variable);
+
+ int width = var_get_width (variable);
+
+ union value val;
+ value_init (&val, width);
+ char *xx =
+ data_in (ss_cstr (in), psppire_dict_encoding (store->dict),
+ fmt->type, &val, width, "UTF-8");
+
+ GVariant *vrnt = value_variant_new (&val, width);
+ value_destroy (&val, width);
+
+ g_value_init (out, G_TYPE_VARIANT);
+ g_value_set_variant (out, vrnt);
+ free (xx);
+ return TRUE;
+}
+
+static char *
+unlabeled_value (PsppireDataStore *store, const struct variable *variable, const union value *val)
+{
+ const struct fmt_spec *fmt = var_get_print_format (variable);
+ return data_out (val, psppire_dict_encoding (store->dict), fmt);
+}
+
+gchar *
+psppire_data_store_value_to_string (gpointer unused, PsppireDataStore *store, gint col, gint row, const GValue *v)
+{
+ const struct variable *variable = psppire_dict_get_variable (store->dict, col);
+ g_return_val_if_fail (variable, g_strdup ("???"));
+
+ GVariant *vrnt = g_value_get_variant (v);
+ union value val;
+ value_variant_get (&val, vrnt);
+
+ char *out = unlabeled_value (store, variable, &val);
+
+ value_destroy_from_variant (&val, vrnt);
+
+ return out;
+}
+
+gchar *
+psppire_data_store_value_to_string_with_labels (gpointer unused, PsppireDataStore *store, gint col, gint row, const GValue *v)
+{
+ const struct variable *variable = psppire_dict_get_variable (store->dict, col);
+ g_return_val_if_fail (variable, g_strdup ("???"));
+
+ GVariant *vrnt = g_value_get_variant (v);
+ union value val;
+ value_variant_get (&val, vrnt);
+
+ char *out = NULL;
+
+ const struct val_labs *vls = var_get_value_labels (variable);
+ struct val_lab *vl = val_labs_lookup (vls, &val);
+ if (vl != NULL)
+ out = strdup (val_lab_get_label (vl));
+ else
+ out = unlabeled_value (store, variable, &val);
+
+ value_destroy_from_variant (&val, vrnt);
+ return out;
+}
static void
__get_value (GtkTreeModel *tree_model,
PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model);
g_return_if_fail (iter->stamp == store->stamp);
-
+
const struct variable *variable = psppire_dict_get_variable (store->dict, column);
if (NULL == variable)
return;
- if (var_is_numeric (variable))
- g_value_init (value, G_TYPE_DOUBLE);
- else
- g_value_init (value, G_TYPE_STRING);
+ g_value_init (value, G_TYPE_VARIANT);
gint row = GPOINTER_TO_INT (iter->user_data);
struct ccase *cc = datasheet_get_row (store->datasheet, row);
-
- if (var_is_numeric (variable))
- g_value_set_double (value, case_data_idx (cc, column)->f);
- else
- {
- const gchar *ss = value_str (case_data_idx (cc, column),
- var_get_width (variable));
- g_value_set_string (value, ss);
- }
- case_unref (cc);
-}
+ const union value *val = case_data_idx (cc, var_get_case_index (variable));
-static GType
-__get_type (GtkTreeModel *tree_model, gint idx)
-{
- PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model);
+ GVariant *vv = value_variant_new (val, var_get_width (variable));
- const struct variable *variable = psppire_dict_get_variable (store->dict, idx);
+ g_value_set_variant (value, vv);
- if (NULL == variable)
- return 0;
-
- if (var_is_numeric (variable))
- return G_TYPE_DOUBLE;
-
- return G_TYPE_STRING;
+ case_unref (cc);
}
+
static void
__tree_model_init (GtkTreeModelIface *iface)
{
iface->get_flags = __tree_model_get_flags;
iface->get_n_columns = __tree_model_get_n_columns ;
- iface->get_column_type = __get_type;
- iface->get_iter = NULL;
- iface->iter_next = NULL;
- iface->get_path = NULL;
+ iface->get_column_type = NULL;
+ iface->get_iter = NULL;
+ iface->iter_next = NULL;
+ iface->get_path = NULL;
iface->get_value = __get_value;
- iface->iter_children = NULL;
- iface->iter_has_child = NULL;
+ iface->iter_children = NULL;
+ iface->iter_has_child = NULL;
iface->iter_n_children = __tree_model_iter_n_children;
iface->iter_nth_child = __iter_nth_child;
- iface->iter_parent = NULL;
+ iface->iter_parent = NULL;
}
object_class->finalize = psppire_data_store_finalize;
object_class->dispose = psppire_data_store_dispose;
- signals [ITEMS_CHANGED] =
- g_signal_new ("changed",
+ signals [ITEMS_CHANGED] =
+ g_signal_new ("items-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
psppire_marshal_VOID__UINT_UINT_UINT,
G_TYPE_NONE,
3,
- G_TYPE_UINT,
- G_TYPE_UINT,
- G_TYPE_UINT);
-
- signals [CASE_INSERTED] =
- g_signal_new ("case-inserted",
- G_TYPE_FROM_CLASS (class),
- G_SIGNAL_RUN_FIRST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__INT,
- G_TYPE_NONE,
- 1,
- G_TYPE_INT);
-
+ G_TYPE_UINT, /* Index of the start of the change */
+ G_TYPE_UINT, /* The number of items deleted */
+ G_TYPE_UINT); /* The number of items inserted */
signals [CASE_CHANGED] =
g_signal_new ("case-changed",
G_TYPE_NONE,
1,
G_TYPE_INT);
-
- signals [CASES_DELETED] =
- g_signal_new ("cases-deleted",
- 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);
}
-static gboolean
-psppire_data_store_insert_value (PsppireDataStore *ds,
- gint width, gint where);
-
casenumber
psppire_data_store_get_case_count (const PsppireDataStore *store)
{
data_store->stamp = g_random_int ();
}
+
+static void
+psppire_data_store_delete_value (PsppireDataStore *store, gint case_index)
+{
+ g_return_if_fail (store->datasheet);
+ datasheet_delete_columns (store->datasheet, case_index, 1);
+ datasheet_insert_column (store->datasheet, NULL, -1, case_index);
+}
+
+
/*
A callback which occurs after a variable has been deleted.
*/
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (data);
- g_return_if_fail (store->datasheet);
-
- datasheet_delete_columns (store->datasheet, case_index, 1);
- datasheet_insert_column (store->datasheet, NULL, -1, case_index);
+ psppire_data_store_delete_value (store, case_index);
}
struct resize_datum_aux
ds->datasheet = datasheet_create (reader);
gint new_n = datasheet_get_n_rows (ds->datasheet);
-
+
if ( ds->dict )
for (i = 0 ; i < n_dict_signals; ++i )
{
return result;
}
+gboolean
+psppire_data_store_get_value (PsppireDataStore *store,
+ glong row, const struct variable *var,
+ union value *val)
+{
+ g_return_val_if_fail (store != NULL, FALSE);
+ g_return_val_if_fail (store->datasheet != NULL, FALSE);
+ g_return_val_if_fail (var != NULL, FALSE);
+
+ if (row < 0 || row >= datasheet_get_n_rows (store->datasheet))
+ return FALSE;
+
+ int width = var_get_width (var);
+ value_init (val, width);
+ datasheet_get_value (store->datasheet, row, var_get_case_index (var), val);
+
+ return TRUE;
+}
+
+
+
gchar *
psppire_data_store_get_string (PsppireDataStore *store,
glong row, const struct variable *var,
{
gchar *string;
union value v;
- int width;
-
- g_return_val_if_fail (store != NULL, NULL);
- g_return_val_if_fail (store->datasheet != NULL, NULL);
- g_return_val_if_fail (var != NULL, NULL);
-
- if (row < 0 || row >= datasheet_get_n_rows (store->datasheet))
+ int width = var_get_width (var);
+ if (! psppire_data_store_get_value (store, row, var, &v))
return NULL;
- width = var_get_width (var);
- value_init (&v, width);
- datasheet_get_value (store->datasheet, row, var_get_case_index (var), &v);
-
string = NULL;
if (use_value_label)
{
psppire_dict_clear (ds->dict);
- g_signal_emit (ds, signals [CASES_DELETED], 0, 0, -1);
+ g_signal_emit (ds, signals [ITEMS_CHANGED], 0, 0, -1, 0);
}
return reader;
}
-
-
-/* Column related funcs */
-
-
-static const gchar null_var_name[]=N_("var");
-
-
-\f
-
-
/* Returns the CASENUMth case, or a null pointer on failure.
*/
struct ccase *
datasheet_delete_rows (ds->datasheet, first, n_cases);
- g_signal_emit (ds, signals [CASES_DELETED], 0, first, n_cases);
+ g_signal_emit (ds, signals[ITEMS_CHANGED], 0, first, n_cases, 0);
return TRUE;
}
result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
if ( result )
- g_signal_emit (ds, signals [CASE_INSERTED], 0, posn);
+ {
+ g_signal_emit (ds, signals[ITEMS_CHANGED], 0, posn, 0, 1);
+ }
else
g_warning ("Cannot insert case at position %ld\n", posn);
ok = datasheet_put_value (ds->datasheet, casenum, var_get_case_index (var),
v);
if (ok)
- g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum);
+ {
+ g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum);
+ g_signal_emit (ds, signals [ITEMS_CHANGED], 0, casenum, 1, 1);
+ }
return ok;
}
given WIDTH into every one of them at the position immediately
preceding WHERE.
*/
-static gboolean
+gboolean
psppire_data_store_insert_value (PsppireDataStore *ds,
gint width, gint where)
{
projects / pspp / blobdiff