/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006 Free Software Foundation
+ Copyright (C) 2006, 2009 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
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-
+#include <libpspp/i18n.h>
#include <gobject/gvaluecollector.h>
#include "var-display.h"
+static void
+var_change_callback (GtkWidget *w, gint n, gpointer data)
+{
+ PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
+
+ psppire_sheet_model_range_changed (model,
+ n, 0, n, PSPPIRE_VAR_STORE_n_COLS);
+}
+
+
+static void
+var_delete_callback (GtkWidget *w, gint dict_idx, gint case_idx, gint val_cnt, gpointer data)
+{
+ PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
+
+ psppire_sheet_model_rows_deleted (model, dict_idx, 1);
+}
+
+
+
+static void
+var_insert_callback (GtkWidget *w, glong row, gpointer data)
+{
+ PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
+
+ psppire_sheet_model_rows_inserted (model, row, 1);
+}
+
+static void
+refresh (PsppireDict *d, gpointer data)
+{
+ PsppireVarStore *vs = data;
+
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (vs), -1, -1, -1, -1);
+}
+
enum
{
PROP_0,
- PSPPIRE_VAR_STORE_FORMAT_TYPE
+ PSPPIRE_VAR_STORE_FORMAT_TYPE,
+ PSPPIRE_VAR_STORE_DICT
};
static void psppire_var_store_init (PsppireVarStore *var_store);
static void psppire_var_store_class_init (PsppireVarStoreClass *class);
static void psppire_var_store_sheet_model_init (PsppireSheetModelIface *iface);
static void psppire_var_store_finalize (GObject *object);
-
-
-gchar * missing_values_to_string (const struct variable *pv, GError **err);
+static void psppire_var_store_dispose (GObject *object);
static gchar *psppire_var_store_get_string (const PsppireSheetModel *sheet_model, glong row, glong column);
static glong psppire_var_store_get_row_count (const PsppireSheetModel * model);
static glong psppire_var_store_get_column_count (const PsppireSheetModel * model);
-static gchar *text_for_column (const struct variable *pv, gint c, GError **err);
+static gchar *text_for_column (PsppireVarStore *vs, const struct variable *pv,
+ gint c, GError **err);
static GObjectClass *parent_class = NULL;
self->format_type = g_value_get_enum (value);
break;
+ case PSPPIRE_VAR_STORE_DICT:
+ if ( self->dictionary)
+ g_object_unref (self->dictionary);
+ self->dictionary = g_value_dup_object (value);
+ g_signal_connect (self->dictionary, "variable-changed", G_CALLBACK (var_change_callback),
+ self);
+
+ g_signal_connect (self->dictionary, "variable-deleted", G_CALLBACK (var_delete_callback),
+ self);
+
+ g_signal_connect (self->dictionary, "variable-inserted",
+ G_CALLBACK (var_insert_callback), self);
+
+ g_signal_connect (self->dictionary, "backend-changed", G_CALLBACK (refresh),
+ self);
+
+ /* The entire model has changed */
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (self), -1, -1, -1, -1);
+
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
g_value_set_enum (value, self->format_type);
break;
+ case PSPPIRE_VAR_STORE_DICT:
+ g_value_take_object (value, self->dictionary);
+ break;
+
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
psppire_var_store_class_init (PsppireVarStoreClass *class)
{
GObjectClass *object_class;
- GParamSpec *pspec;
+ GParamSpec *format_pspec;
+ GParamSpec *dict_pspec;
parent_class = g_type_class_peek_parent (class);
object_class = (GObjectClass*) class;
object_class->finalize = psppire_var_store_finalize;
+ object_class->dispose = psppire_var_store_dispose;
object_class->set_property = psppire_var_store_set_property;
object_class->get_property = psppire_var_store_get_property;
- pspec = g_param_spec_enum ("format-type",
+ format_pspec = g_param_spec_enum ("format-type",
"Variable format type",
("Whether variables have input or output "
"formats"),
g_object_class_install_property (object_class,
PSPPIRE_VAR_STORE_FORMAT_TYPE,
- pspec);
+ format_pspec);
+
+ dict_pspec = g_param_spec_object ("dictionary",
+ "Dictionary",
+ "The PsppireDict represented by this var store",
+ PSPPIRE_TYPE_DICT,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+
+ g_object_class_install_property (object_class,
+ PSPPIRE_VAR_STORE_DICT,
+ dict_pspec);
}
#define DISABLED_COLOR "gray"
if ( ! gdk_color_parse (DISABLED_COLOR, &var_store->disabled))
g_critical ("Could not parse color \"%s\"", DISABLED_COLOR);
- var_store->dict = 0;
+ var_store->dictionary = NULL;
var_store->format_type = PSPPIRE_VAR_STORE_OUTPUT_FORMATS;
}
struct variable *
psppire_var_store_get_var (PsppireVarStore *store, glong row)
{
- return psppire_dict_get_variable (store->dict, row);
+ return psppire_dict_get_variable (store->dictionary, row);
}
static gboolean
{
PsppireVarStore *retval;
- retval = g_object_new (GTK_TYPE_VAR_STORE, NULL);
+ retval = g_object_new (GTK_TYPE_VAR_STORE, "dictionary", dict, NULL);
- psppire_var_store_set_dictionary (retval, dict);
+ // psppire_var_store_set_dictionary (retval, dict);
return retval;
}
-static void
-var_change_callback (GtkWidget *w, gint n, gpointer data)
-{
- PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
-
- psppire_sheet_model_range_changed (model,
- n, 0, n, PSPPIRE_VAR_STORE_n_COLS);
-}
-
-
-static void
-var_delete_callback (GtkWidget *w, gint dict_idx, gint case_idx, gint val_cnt, gpointer data)
-{
- PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
-
- psppire_sheet_model_rows_deleted (model, dict_idx, 1);
-}
-
-
-
-static void
-var_insert_callback (GtkWidget *w, glong row, gpointer data)
-{
- PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data);
-
- psppire_sheet_model_rows_inserted (model, row, 1);
-}
-
-static void
-refresh (PsppireDict *d, gpointer data)
-{
- PsppireVarStore *vs = data;
-
- psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (vs), -1, -1, -1, -1);
-}
-
+#if 0
/**
* psppire_var_store_replace_set_dictionary:
* @var_store: The variable store
/* The entire model has changed */
psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (var_store), -1, -1, -1, -1);
}
+#endif
static void
psppire_var_store_finalize (GObject *object)
(* parent_class->finalize) (object);
}
+static void
+psppire_var_store_dispose (GObject *object)
+{
+ PsppireVarStore *self = PSPPIRE_VAR_STORE (object);
+
+ if (self->dictionary)
+ g_object_unref (self->dictionary);
+
+ /* must chain up */
+ (* parent_class->finalize) (object);
+}
+
+
static gchar *
-psppire_var_store_get_string (const PsppireSheetModel *model, glong row, glong column)
+psppire_var_store_get_string (const PsppireSheetModel *model,
+ glong row, glong column)
{
PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
struct variable *pv;
- if ( row >= psppire_dict_get_var_cnt (store->dict))
+ if ( row >= psppire_dict_get_var_cnt (store->dictionary))
return 0;
- pv = psppire_dict_get_variable (store->dict, row);
+ pv = psppire_dict_get_variable (store->dictionary, row);
- return text_for_column (pv, column, 0);
+ return text_for_column (store, pv, column, 0);
}
PsppireVarStore *var_store = PSPPIRE_VAR_STORE (model);
- if ( row >= psppire_dict_get_var_cnt (var_store->dict))
+ if ( row >= psppire_dict_get_var_cnt (var_store->dictionary))
return FALSE;
pv = psppire_var_store_get_var (var_store, row);
switch (col)
{
case PSPPIRE_VAR_STORE_COL_LABEL:
- var_set_label (pv, 0);
+ var_set_label (pv, NULL);
return TRUE;
break;
}
PsppireVarStore *var_store = PSPPIRE_VAR_STORE (model);
- if ( row >= psppire_dict_get_var_cnt (var_store->dict))
+ if ( row >= psppire_dict_get_var_cnt (var_store->dictionary))
return FALSE;
pv = psppire_var_store_get_var (var_store, row);
{
case PSPPIRE_VAR_STORE_COL_NAME:
{
- int i;
- /* Until non-ascii in variable names is better managed,
- simply refuse to allow them to be entered. */
- for (i = 0 ; i < strlen (text) ; ++i )
- if (!g_ascii_isprint (text[i]))
- return FALSE;
- return psppire_dict_rename_var (var_store->dict, pv, text);
- break;
+ gboolean ok;
+ ok = psppire_dict_rename_var (var_store->dictionary, pv, text);
+ return ok;
}
case PSPPIRE_VAR_STORE_COL_COLUMNS:
if ( ! text) return FALSE;
break;
case PSPPIRE_VAR_STORE_COL_WIDTH:
{
- int width = atoi (text);
- if ( ! text) return FALSE;
+ const int width = atoi (text);
+ if ( ! text)
+ return FALSE;
+
+ if (width < 0)
+ return FALSE;
+
if ( var_is_alpha (pv))
+ {
+ if ( width > MAX_STRING )
+ return FALSE;
var_set_width (pv, width);
+ }
else
{
bool for_input
break;
case PSPPIRE_VAR_STORE_COL_LABEL:
{
- gchar *s = utf8_to_pspp_locale (text, -1, NULL);
- var_set_label (pv, s);
- free (s);
+ var_set_label (pv, text);
return TRUE;
}
break;
static const gchar none[] = N_("None");
static gchar *
-text_for_column (const struct variable *pv, gint c, GError **err)
+text_for_column (PsppireVarStore *vs,
+ const struct variable *pv, gint c, GError **err)
{
+ PsppireDict *dict = vs->dictionary;
static const gchar *const type_label[] =
{
N_("Numeric"),
N_("Custom"),
N_("String")
};
+
enum {VT_NUMERIC, VT_COMMA, VT_DOT, VT_SCIENTIFIC, VT_DATE, VT_DOLLAR,
VT_CUSTOM, VT_STRING};
switch (c)
{
case PSPPIRE_VAR_STORE_COL_NAME:
- return pspp_locale_to_utf8 ( var_get_name (pv), -1, err);
+ return xstrdup (var_get_name (pv));
break;
case PSPPIRE_VAR_STORE_COL_TYPE:
{
}
break;
case PSPPIRE_VAR_STORE_COL_LABEL:
- return pspp_locale_to_utf8 (var_get_label (pv), -1, err);
+ {
+ const char *label = var_get_label (pv);
+ if (label)
+ return xstrdup (label);
+ return NULL;
+ }
break;
case PSPPIRE_VAR_STORE_COL_MISSING:
{
- return missing_values_to_string (pv, err);
+ return missing_values_to_string (dict, pv, err);
}
break;
case PSPPIRE_VAR_STORE_COL_VALUES:
return g_locale_to_utf8 (gettext (none), -1, 0, 0, err);
else
{
- gchar *ss;
- GString *gstr = g_string_sized_new (10);
const struct val_labs *vls = var_get_value_labels (pv);
- struct val_labs_iterator *ip = 0;
- struct val_lab *vl = val_labs_first_sorted (vls, &ip);
+ const struct val_lab **labels = val_labs_sorted (vls);
+ const struct val_lab *vl = labels[0];
+ free (labels);
g_assert (vl);
{
- gchar *const vstr = value_to_text (vl->value, *write_spec);
+ gchar *const vstr = value_to_text (vl->value, dict, *write_spec);
- g_string_printf (gstr, "{%s,\"%s\"}_", vstr, vl->label);
- g_free (vstr);
+ return g_strdup_printf ( "{%s,\"%s\"}_", vstr, val_lab_get_label (vl));
}
-
- val_labs_done (&ip);
-
- ss = pspp_locale_to_utf8 (gstr->str, gstr->len, err);
- g_string_free (gstr, TRUE);
- return ss;
}
}
break;
gint
psppire_var_store_get_var_cnt (PsppireVarStore *store)
{
- return psppire_dict_get_var_cnt (store->dict);
+ return psppire_dict_get_var_cnt (store->dictionary);
}
gint rows = 0;
PsppireVarStore *vs = PSPPIRE_VAR_STORE (model);
- if (vs->dict)
- rows = psppire_dict_get_var_cnt (vs->dict);
+ if (vs->dictionary)
+ rows = psppire_dict_get_var_cnt (vs->dictionary);
return rows ;
}
{
PsppireVarStore *vs = PSPPIRE_VAR_STORE (model);
- if ( ! vs->dict)
+ if ( ! vs->dictionary)
return FALSE;
- return row < psppire_dict_get_var_cnt (vs->dict);
+ return row < psppire_dict_get_var_cnt (vs->dictionary);
}
projects / pspp-builds.git / blobdiff