#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
{
- BACKEND_CHANGED,
+ ITEMS_CHANGED,
CASES_DELETED,
CASE_INSERTED,
CASE_CHANGED,
return n;
}
+static GtkTreeModelFlags
+__tree_model_get_flags (GtkTreeModel *model)
+{
+ g_return_val_if_fail (PSPPIRE_IS_DATA_STORE (model), (GtkTreeModelFlags) 0);
+
+ return GTK_TREE_MODEL_LIST_ONLY;
+}
static gint
__tree_model_get_n_columns (GtkTreeModel *tree_model)
return FALSE;
}
- iter->user_data = n;
+ iter->user_data = GINT_TO_POINTER (n);
+ iter->stamp = store->stamp;
+
return TRUE;
}
+void
+myreversefunc (GtkTreeModel *model, gint col, gint row,
+ const gchar *in, GValue *out)
+{
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+
+ const struct variable *variable = psppire_dict_get_variable (store->dict, col);
+ g_return_if_fail (variable);
+
+ 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);
+}
+
+gchar *
+myconvfunc (GtkTreeModel *model, gint col, gint row, const GValue *v)
+{
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+
+ 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);
+
+ const struct fmt_spec *fmt = var_get_print_format (variable);
+ char *out = data_out (&val, psppire_dict_encoding (store->dict), fmt);
+ value_destroy_from_variant (&val, vrnt);
+
+ return out;
+}
static void
__get_value (GtkTreeModel *tree_model,
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model);
- g_value_init (value, G_TYPE_DOUBLE);
+ g_return_if_fail (iter->stamp == store->stamp);
+
+ const struct variable *variable = psppire_dict_get_variable (store->dict, column);
+ if (NULL == variable)
+ return;
+
+ g_value_init (value, G_TYPE_VARIANT);
gint row = GPOINTER_TO_INT (iter->user_data);
struct ccase *cc = datasheet_get_row (store->datasheet, row);
+
+ const union value *val = case_data_idx (cc, column);
+
+ GVariant *vv = value_variant_new (val, var_get_width (variable));
+
+ g_value_set_variant (value, vv);
- g_value_set_double (value, case_data_idx (cc, column)->f);
case_unref (cc);
}
static void
__tree_model_init (GtkTreeModelIface *iface)
{
- iface->get_flags = NULL;
+ iface->get_flags = __tree_model_get_flags;
iface->get_n_columns = __tree_model_get_n_columns ;
- iface->get_column_type = NULL;
+ iface->get_column_type = NULL;
iface->get_iter = NULL;
iface->iter_next = NULL;
iface->get_path = NULL;
object_class->finalize = psppire_data_store_finalize;
object_class->dispose = psppire_data_store_dispose;
- signals [BACKEND_CHANGED] =
- g_signal_new ("backend-changed",
+ signals [ITEMS_CHANGED] =
+ g_signal_new ("changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ psppire_marshal_VOID__UINT_UINT_UINT,
G_TYPE_NONE,
- 0);
+ 3,
+ G_TYPE_UINT,
+ G_TYPE_UINT,
+ G_TYPE_UINT);
signals [CASE_INSERTED] =
g_signal_new ("case-inserted",
data_store->dict = NULL;
data_store->datasheet = NULL;
data_store->dispose_has_run = FALSE;
+ data_store->stamp = g_random_int ();
}
/*
struct casereader *reader)
{
gint i;
-
+ gint old_n = 0;
if ( ds->datasheet)
- datasheet_destroy (ds->datasheet);
+ {
+ old_n = datasheet_get_n_rows (ds->datasheet);
+ datasheet_destroy (ds->datasheet);
+ }
ds->datasheet = datasheet_create (reader);
- g_signal_emit_by_name (ds, "notify", 0, 0);
- g_print ("Datasheet row count %d\n", datasheet_get_n_rows (ds->datasheet));
-
+ gint new_n = datasheet_get_n_rows (ds->datasheet);
+
if ( ds->dict )
for (i = 0 ; i < n_dict_signals; ++i )
{
}
}
- g_signal_emit (ds, signals[BACKEND_CHANGED], 0);
+ g_signal_emit (ds, signals[ITEMS_CHANGED], 0, 0, old_n, new_n);
}
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)
{
projects / pspp / blobdiff