#include <config.h>
#include <string.h>
#include <stdlib.h>
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
-#include "gtksheet.h"
-#include "gsheetmodel.h"
-#include "gsheet-column-iface.h"
+
+
+#include <gtksheet/gtksheet.h>
+#include <gtksheet/gsheetmodel.h>
+#include <gtksheet/gsheet-column-iface.h>
#include "psppire-variable.h"
#include "psppire-data-store.h"
+#include "helper.h"
-#include "dictionary.h"
-#include "missing-values.h"
-#include "value-labels.h"
-#include "data-in.h"
+#include <data/dictionary.h>
+#include <data/missing-values.h>
+#include <data/value-labels.h>
+#include <data/data-in.h>
-#include "file-handle-def.h"
-#include "sys-file-writer.h"
+#include <data/file-handle-def.h>
+#include <data/sys-file-writer.h>
-#define _(A) A
-#define N_(A) A
static void psppire_data_store_init (PsppireDataStore *data_store);
static void psppire_data_store_sheet_column_init (GSheetColumnIface *iface);
static void psppire_data_store_finalize (GObject *object);
-static const gchar *const psppire_data_store_get_string(GSheetModel *sheet_model, gint row, gint column);
+static const gchar *psppire_data_store_get_string(GSheetModel *sheet_model, gint row, gint column);
static gboolean psppire_data_store_set_string(GSheetModel *model,
const gchar *text, gint row, gint column);
#define MIN_COLUMNS 10
-#define max(A,B) ((A>B)?A:B)
static GObjectClass *parent_class = NULL;
}
+
+static gint
+psppire_data_store_get_var_count (const GSheetModel *model)
+{
+ const PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
+
+ return psppire_dict_get_var_cnt(store->dict);
+}
+
+static gint
+psppire_data_store_get_case_count (const GSheetModel *model)
+{
+ const PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
+
+ return psppire_case_array_get_n_cases(store->cases);
+}
+
+
static void
psppire_data_store_init (PsppireDataStore *data_store)
{
static void
psppire_data_store_sheet_model_init (GSheetModelIface *iface)
{
+ iface->free_strings = TRUE;
iface->get_string = psppire_data_store_get_string;
iface->set_string = psppire_data_store_set_string;
iface->clear_datum = psppire_data_store_clear_datum;
iface->get_background = NULL;
iface->get_font_desc = psppire_data_store_get_font_desc;
iface->get_cell_border = NULL;
+ iface->get_column_count = psppire_data_store_get_var_count;
+ iface->get_row_count = psppire_data_store_get_case_count;
}
static
}
-
static void
delete_cases_callback(GtkWidget *w, gint first, gint n_cases, gpointer data)
{
+ PsppireDataStore *store ;
+
g_return_if_fail (data);
- PsppireDataStore *store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE(data);
g_assert(first >= 0);
static void
insert_case_callback(GtkWidget *w, gint casenum, gpointer data)
{
+ PsppireDataStore *store ;
+
g_return_if_fail (data);
- PsppireDataStore *store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE(data);
g_sheet_model_range_changed (G_SHEET_MODEL(store),
- casenum, -1,
- psppire_case_array_get_n_cases(store->cases),
- -1);
+ casenum, -1,
+ psppire_case_array_get_n_cases(store->cases),
+ -1);
}
static void
changed_case_callback(GtkWidget *w, gint casenum, gpointer data)
{
+ PsppireDataStore *store ;
g_return_if_fail (data);
- PsppireDataStore *store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE(data);
-
g_sheet_model_range_changed (G_SHEET_MODEL(store),
casenum, -1,
casenum, -1);
static void
-delete_variables_callback(GtkWidget *w, gint var_num, gint n_vars, gpointer data)
+delete_variables_callback(GObject *obj, gint var_num, gint n_vars, gpointer data)
{
+ PsppireDataStore *store ;
+
g_return_if_fail (data);
- PsppireDataStore *store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE(data);
g_sheet_column_columns_deleted(G_SHEET_COLUMN(store),
var_num, n_vars);
+
+ g_sheet_model_columns_deleted (G_SHEET_MODEL(store), var_num, n_vars);
}
static void
-insert_variable_callback(GtkWidget *w, gint var_num, gpointer data)
+insert_variable_callback(GObject *obj, gint var_num, gpointer data)
{
+ PsppireDataStore *store;
+
g_return_if_fail (data);
- PsppireDataStore *store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE(data);
/*
g_sheet_model_range_changed (G_SHEET_MODEL(store),
psppire_case_array_resize(store->cases,
dict_get_next_value_idx (store->dict->dict));
+ g_sheet_model_columns_inserted (G_SHEET_MODEL(store), var_num, 1);
}
g_signal_connect(cases, "case-changed", G_CALLBACK(changed_case_callback),
retval);
-
psppire_data_store_set_dictionary(retval, dict);
G_CALLBACK(delete_variables_callback),
data_store);
-
/* The entire model has changed */
g_sheet_model_range_changed (G_SHEET_MODEL(data_store), -1, -1, -1, -1);
}
}
-static const gchar *const
+static const gchar *
psppire_data_store_get_string(GSheetModel *model, gint row, gint column)
{
- static gchar s[255];
+ const char *text;
+ const struct fmt_spec *fp ;
+ const struct PsppireVariable *pv ;
+ const union value *v ;
+ GString *s;
PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
g_return_val_if_fail(store->dict, NULL);
if ( row >= psppire_case_array_get_n_cases(store->cases))
return NULL;
- const struct PsppireVariable *pv = psppire_dict_get_variable(store->dict, column);
+ pv = psppire_dict_get_variable(store->dict, column);
- const union value *v =
- psppire_case_array_get_value(store->cases, row,
+ v = psppire_case_array_get_value(store->cases, row,
psppire_variable_get_index(pv));
-
if ( store->show_labels)
{
const struct val_labs * vl = psppire_variable_get_value_labels(pv);
const gchar *label;
if ( (label = val_labs_find(vl, *v)) )
{
- return label;
+ return pspp_locale_to_utf8(label, -1, 0);
}
}
- const struct fmt_spec *fp = psppire_variable_get_write_spec(pv);
+ fp = psppire_variable_get_write_spec(pv);
- if ( psppire_variable_get_type(pv) == NUMERIC )
- {
- /* Converts binary value V into printable form in the exactly
- FP->W character in buffer S according to format specification
- FP. No null terminator is appended to the buffer. */
- data_out (s, fp, v);
- s[fp->w] = '\0';
- }
- else
- {
- const gint len = psppire_variable_get_width(pv);
- memcpy(s, v->s, len);
- s[len] = '\0';
- }
+ s = g_string_sized_new (fp->w + 1);
+ g_string_set_size(s, fp->w);
+
+ memset(s->str, 0, fp->w);
- static gchar buf[255];
- GError *err = NULL;
- gchar *text = g_locale_to_utf8(s, fp->w, 0, 0, &err);
- if ( !err )
- {
- g_snprintf(buf, 255, text);
- g_free(text);
- }
- else
- {
- g_warning("Cannot convert string \"%s\" to utf-8: %s\n", s, err->message);
- g_error_free(err);
- return NULL;
- }
+ g_assert(fp->w == s->len);
+
+ /* Converts binary value V into printable form in the exactly
+ FP->W character in buffer S according to format specification
+ FP. No null terminator is appended to the buffer. */
+ data_out (s->str, fp, v);
+
+ text = pspp_locale_to_utf8(s->str, fp->w, 0);
+ g_string_free(s, TRUE);
- return buf ;
+ return text;
}
PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
const struct PsppireVariable *pv = psppire_dict_get_variable(store->dict, col);
+ g_return_val_if_fail(pv, FALSE);
for(r = psppire_case_array_get_n_cases(store->cases) ; r <= row ; ++r )
{
gint c;
- psppire_case_array_insert_case(store->cases, r);
+ psppire_case_array_insert_case(store->cases, r, 0, 0);
for (c = 0 ; c < psppire_dict_get_var_cnt(store->dict); ++c )
psppire_data_store_clear_datum(model, r, c);
}
- const gint index = psppire_variable_get_index(pv);
+ {
+ const gint index = psppire_variable_get_index(pv);
- struct data_in d_in;
- d_in.s = text;
- d_in.e = text + strlen(text);
- d_in.v = 0;
- d_in.f1 = d_in.f2 = 0;
- d_in.format = * psppire_variable_get_write_spec(pv);
- d_in.flags = 0;
+ struct data_in d_in;
+ d_in.s = text;
+ d_in.e = text + strlen(text);
+ d_in.v = 0;
+ d_in.f1 = d_in.f2 = 0;
+ d_in.format = * psppire_variable_get_write_spec(pv);
+ d_in.flags = 0;
- psppire_case_array_set_value(store->cases, row, index, fillit, &d_in);
+ psppire_case_array_set_value(store->cases, row, index, fillit, &d_in);
+ }
return TRUE;
}
psppire_data_store_create_system_file(PsppireDataStore *store,
struct file_handle *handle)
{
- g_assert(handle);
-
const struct sfm_write_options wo = {
true, /* writeable */
false, /* dont compress */
3 /* version */
};
- struct sfm_writer *writer = sfm_open_writer(handle, store->dict->dict, wo);
+ struct sfm_writer *writer ;
+
+ g_assert(handle);
+
+ writer = sfm_open_writer(handle, store->dict->dict, wo);
if ( ! writer)
return;
{
PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
- return max(MIN_COLUMNS, psppire_dict_get_var_cnt(ds->dict));
+ return MAX(MIN_COLUMNS, psppire_dict_get_var_cnt(ds->dict));
}
/* Return the width that an 'M' character would occupy when typeset at
row, col */
static guint
-M_width(GtkSheet *sheet, gint row, gint col)
+M_width(const GtkSheet *sheet, gint row, gint col)
{
GtkSheetCellAttr attributes;
-
- gtk_sheet_get_attributes(sheet, row, col, &attributes);
-
PangoRectangle rect;
/* FIXME: make this a member of the data store */
static PangoLayout *layout = 0;
+ gtk_sheet_get_attributes(sheet, row, col, &attributes);
+
if (! layout )
layout = gtk_widget_create_pango_layout (GTK_WIDGET(sheet), "M");
+
+ g_assert(layout);
pango_layout_set_font_description (layout,
attributes.font_desc);
static gint
geometry_get_width(const GSheetColumn *geom, gint unit, GtkSheet *sheet)
{
+ const struct PsppireVariable *pv ;
PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
if ( unit >= psppire_dict_get_var_cnt(ds->dict) )
return 75;
/* FIXME: We can optimise this by caching the widths until they're resized */
- const struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit);
+ pv = psppire_dict_get_variable(ds->dict, unit);
return columnWidthToPixels(sheet, unit, psppire_variable_get_columns(pv));
}
geometry_get_justification(const GSheetColumn *geom, gint unit)
{
PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ const struct PsppireVariable *pv ;
if ( unit >= psppire_dict_get_var_cnt(ds->dict) )
return GTK_JUSTIFY_LEFT;
- const struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit);
+ pv = psppire_dict_get_variable(ds->dict, unit);
/* Kludge: Happily GtkJustification is defined similarly
to enum alignment from pspp/variable.h */
}
-static const gchar null_var_name[]=_("var");
+static const gchar null_var_name[]=N_("var");
static const gchar *
geometry_get_button_label(const GSheetColumn *geom, gint unit)
{
+ const gchar *text;
+ struct PsppireVariable *pv ;
PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
if ( unit >= psppire_dict_get_var_cnt(ds->dict) )
- return null_var_name;
+ return g_locale_to_utf8(null_var_name, -1, 0, 0, 0);
- struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit);
+ pv = psppire_dict_get_variable(ds->dict, unit);
+
+ text = pspp_locale_to_utf8(psppire_variable_get_name(pv), -1, 0);
- return psppire_variable_get_name(pv);
+ return text;
}
projects / pspp-builds.git / blobdiff