/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006, 2008 Free Software Foundation
+ Copyright (C) 2006, 2008, 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
#include <data/data-out.h>
#include <data/variable.h>
-#include <gtksheet/gsheetmodel.h>
+#include <ui/gui/sheet/psppire-sheetmodel.h>
+#include <ui/gui/psppire-marshal.h>
#include <pango/pango-context.h>
#include "xalloc.h"
#include "xmalloca.h"
+
+
static void psppire_data_store_init (PsppireDataStore *data_store);
static void psppire_data_store_class_init (PsppireDataStoreClass *class);
-static void psppire_data_store_sheet_model_init (GSheetModelIface *iface);
+static void psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface);
static void psppire_data_store_finalize (GObject *object);
static void psppire_data_store_dispose (GObject *object);
-static gboolean psppire_data_store_clear_datum (GSheetModel *model,
+static gboolean psppire_data_store_clear_datum (PsppireSheetModel *model,
glong row, glong column);
static GObjectClass *parent_class = NULL;
-enum {
- BACKEND_CHANGED,
- n_SIGNALS};
+enum
+ {
+ BACKEND_CHANGED,
+ CASES_DELETED,
+ CASE_INSERTED,
+ CASE_CHANGED,
+ n_SIGNALS
+ };
static guint signals [n_SIGNALS];
};
- data_store_type = g_type_register_static (G_TYPE_OBJECT, "PsppireDataStore",
+ data_store_type = g_type_register_static (G_TYPE_OBJECT,
+ "PsppireDataStore",
&data_store_info, 0);
g_type_add_interface_static (data_store_type,
- G_TYPE_SHEET_MODEL,
+ PSPPIRE_TYPE_SHEET_MODEL,
&sheet_model_info);
}
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
+
+ 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);
+
+
+ signals [CASE_CHANGED] =
+ g_signal_new ("case-changed",
+ G_TYPE_FROM_CLASS (class),
+ G_SIGNAL_RUN_FIRST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__INT,
+ 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 glong
-psppire_data_store_get_var_count (const GSheetModel *model)
+psppire_data_store_get_var_count (const PsppireSheetModel *model)
{
const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
return psppire_dict_get_value_cnt (store->dict);
}
-casenumber
-psppire_data_store_get_case_count_wrapper (const GSheetModel *model)
+static casenumber
+psppire_data_store_get_case_count_wrapper (const PsppireSheetModel *model)
{
const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
return psppire_data_store_get_case_count (store);
}
static inline gchar *
-psppire_data_store_get_string_wrapper (const GSheetModel *model, glong row,
+psppire_data_store_get_string_wrapper (const PsppireSheetModel *model, glong row,
glong column)
{
return psppire_data_store_get_string (PSPPIRE_DATA_STORE (model), row, column);
static inline gboolean
-psppire_data_store_set_string_wrapper (GSheetModel *model,
+psppire_data_store_set_string_wrapper (PsppireSheetModel *model,
const gchar *text,
glong row, glong column)
{
-static gchar * get_column_subtitle (const GSheetModel *model, gint col);
-static gchar * get_column_button_label (const GSheetModel *model, gint col);
-static gboolean get_column_sensitivity (const GSheetModel *model, gint col);
-static GtkJustification get_column_justification (const GSheetModel *model, gint col);
+static gchar * get_column_subtitle (const PsppireSheetModel *model, gint col);
+static gchar * get_column_button_label (const PsppireSheetModel *model, gint col);
+static gboolean get_column_sensitivity (const PsppireSheetModel *model, gint col);
+static GtkJustification get_column_justification (const PsppireSheetModel *model, gint col);
-static gchar * get_row_button_label (const GSheetModel *model, gint row);
-static gboolean get_row_sensitivity (const GSheetModel *model, gint row);
+static gchar * get_row_button_label (const PsppireSheetModel *model, gint row);
+static gboolean get_row_sensitivity (const PsppireSheetModel *model, gint row);
static void
-psppire_data_store_sheet_model_init (GSheetModelIface *iface)
+psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface)
{
iface->free_strings = TRUE;
iface->get_string = psppire_data_store_get_string_wrapper;
iface->is_editable = NULL;
iface->get_foreground = NULL;
iface->get_background = NULL;
- 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_wrapper;
iface->get_row_sensitivity = get_row_sensitivity;
}
-static void
-delete_cases_callback (GtkWidget *w,
- casenumber first, casenumber n_cases, gpointer data)
-{
- PsppireDataStore *store ;
-
- g_return_if_fail (data);
-
- store = PSPPIRE_DATA_STORE (data);
-
- g_assert (first >= 0);
-
- g_sheet_model_rows_deleted (G_SHEET_MODEL (store), first, n_cases);
-}
-
-
-static void
-insert_case_callback (GtkWidget *w, casenumber casenum, gpointer data)
-{
- PsppireDataStore *store = PSPPIRE_DATA_STORE (data);
-
- g_return_if_fail (data);
-
- g_print ("%s\n", __FUNCTION__);
-
- g_sheet_model_range_changed (G_SHEET_MODEL (store),
- casenum, -1,
- psppire_data_store_get_case_count (store),
- -1);
-
- g_sheet_model_rows_inserted (G_SHEET_MODEL (store), casenum, 1);
-}
-
-
-static void
-changed_case_callback (GtkWidget *w, gint casenum, gpointer data)
-{
- PsppireDataStore *store ;
- g_return_if_fail (data);
-
- store = PSPPIRE_DATA_STORE (data);
-
- g_sheet_model_range_changed (G_SHEET_MODEL (store),
- casenum, -1,
- casenum, -1);
-}
-
/*
A callback which occurs after a variable has been deleted.
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (data);
+
+ psppire_sheet_model_columns_deleted (PSPPIRE_SHEET_MODEL (store), dict_index, 1);
#if AXIS_TRANSITION
- g_sheet_model_columns_deleted (G_SHEET_MODEL (store), dict_index, 1);
- g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
+
+ psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store),
dict_index, -1);
#endif
}
+
static void
variable_changed_callback (GObject *obj, gint var_num, gpointer data)
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (data);
#if AXIS_TRANSITION
- g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
+ psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store),
var_num, 1);
- g_sheet_model_range_changed (G_SHEET_MODEL (store),
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store),
-1, var_num,
-1, var_num);
#endif
psppire_data_store_insert_values (store, 1, posn);
#if AXIS_TRANSITION
- g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
+
+ psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store),
var_num, 1);
#endif
- g_sheet_model_columns_inserted (G_SHEET_MODEL (store), var_num, 1);
+ psppire_sheet_model_columns_inserted (PSPPIRE_SHEET_MODEL (store), var_num, 1);
}
{
gint i;
+ if ( ds->datasheet)
+ datasheet_destroy (ds->datasheet);
+
ds->datasheet = datasheet_create (reader);
- g_sheet_model_range_changed (G_SHEET_MODEL (ds),
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (ds),
-1, -1, -1, -1);
-#if 0
- for (i = 0 ; i < n_cf_signals ; ++i )
- {
- if ( ds->cf_handler_id [i] > 0 )
- g_signal_handler_disconnect (ds->case_file,
- ds->cf_handler_id[i]);
- }
-#endif
-
if ( ds->dict )
for (i = 0 ; i < n_dict_signals; ++i )
{
}
}
-#if 0
- ds->cf_handler_id [CASES_DELETED] =
- g_signal_connect (ds->case_file, "cases-deleted",
- G_CALLBACK (delete_cases_callback),
- ds);
-
- ds->cf_handler_id [CASE_INSERTED] =
- g_signal_connect (ds->case_file, "case-inserted",
- G_CALLBACK (insert_case_callback),
- ds);
-
- ds->cf_handler_id [CASE_CHANGED] =
- g_signal_connect (ds->case_file, "case-changed",
- G_CALLBACK (changed_case_callback),
- ds);
-#endif
-
g_signal_emit (ds, signals[BACKEND_CHANGED], 0);
}
/* The entire model has changed */
- g_sheet_model_range_changed (G_SHEET_MODEL (data_store), -1, -1, -1, -1);
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (data_store), -1, -1, -1, -1);
#if AXIS_TRANSITION
- g_sheet_column_columns_changed (G_SHEET_COLUMN (data_store), 0, -1);
+ psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (data_store), 0, -1);
#endif
if ( data_store->dict )
{
gboolean result;
gint val_cnt, v;
- struct ccase cc;
+ struct ccase *cc;
g_return_val_if_fail (ds, FALSE);
val_cnt = datasheet_get_column_cnt (ds->datasheet) ;
g_return_val_if_fail (posn <= psppire_data_store_get_case_count (ds), FALSE);
- case_create (&cc, val_cnt);
+ cc = case_create (val_cnt);
- memset ( case_data_rw_idx (&cc, 0), 0, val_cnt * MAX_SHORT_STRING);
+ memset ( case_data_rw_idx (cc, 0), 0, val_cnt * MAX_SHORT_STRING);
for (v = 0 ; v < psppire_dict_get_var_cnt (ds->dict) ; ++v)
{
if ( var_is_alpha (pv))
continue;
- case_data_rw (&cc, pv)->f = SYSMIS;
+ case_data_rw (cc, pv)->f = SYSMIS;
}
- result = psppire_data_store_insert_case (ds, &cc, posn);
+ result = psppire_data_store_insert_case (ds, cc, posn);
- case_destroy (&cc);
+ case_unref (cc);
return result;
}
static gboolean
-psppire_data_store_clear_datum (GSheetModel *model,
+psppire_data_store_clear_datum (PsppireSheetModel *model,
glong row, glong col)
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
psppire_data_store_set_value (store, row, index, &v,
var_get_width (pv));
+ psppire_sheet_model_range_changed (model, row, col, row, col);
+
return TRUE;
}
{
glong n_cases;
const struct variable *pv = psppire_dict_get_variable (store->dict, col);
- g_return_val_if_fail (pv, FALSE);
+ if ( NULL == pv)
+ return FALSE;
n_cases = psppire_data_store_get_case_count (store);
var_get_case_index (pv), ss_cstr (text),
var_get_write_format (pv));
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, col);
+
return TRUE;
}
store->show_labels = show_labels;
- g_sheet_model_range_changed (G_SHEET_MODEL (store),
+ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store),
-1, -1, -1, -1);
}
int i;
struct casereader *reader ;
-#if 0
- for (i = 0 ; i < n_cf_signals ; ++i )
- {
- g_signal_handler_disconnect (ds->case_file, ds->cf_handler_id[i]);
- ds->cf_handler_id[i] = 0 ;
- }
-#endif
-
if ( ds->dict )
for (i = 0 ; i < n_dict_signals; ++i )
{
ds->dict_handler_id[i]);
}
- return datasheet_make_reader (ds->datasheet);
+ reader = datasheet_make_reader (ds->datasheet);
+
+ /* We must not reference this again */
+ ds->datasheet = NULL;
+
+ return reader;
}
/* Row related funcs */
static gchar *
-get_row_button_label (const GSheetModel *model, gint unit)
+get_row_button_label (const PsppireSheetModel *model, gint unit)
{
gchar *s = g_strdup_printf (_("%d"), unit + FIRST_CASE_NUMBER);
static gboolean
-get_row_sensitivity (const GSheetModel *model, gint unit)
+get_row_sensitivity (const PsppireSheetModel *model, gint unit)
{
PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
/* Column related stuff */
static gchar *
-get_column_subtitle (const GSheetModel *model, gint col)
+get_column_subtitle (const PsppireSheetModel *model, gint col)
{
gchar *text;
const struct variable *v ;
}
static gchar *
-get_column_button_label (const GSheetModel *model, gint col)
+get_column_button_label (const PsppireSheetModel *model, gint col)
{
gchar *text;
struct variable *pv ;
}
static gboolean
-get_column_sensitivity (const GSheetModel *model, gint col)
+get_column_sensitivity (const PsppireSheetModel *model, gint col)
{
PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
static GtkJustification
-get_column_justification (const GSheetModel *model, gint col)
+get_column_justification (const PsppireSheetModel *model, gint col)
{
PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
const struct variable *pv ;
\f
-/* Fills C with the CASENUMth case.
- Returns true on success, false otherwise.
+/* Returns the CASENUMth case, or a null pointer on failure.
*/
-gboolean
+struct ccase *
psppire_data_store_get_case (const PsppireDataStore *ds,
- casenumber casenum,
- struct ccase *c)
+ casenumber casenum)
{
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
- return datasheet_get_row (ds->datasheet, casenum, c);
+ return datasheet_get_row (ds->datasheet, casenum);
}
gboolean
-psppire_data_store_delete_cases (PsppireDataStore *ds, casenumber n_cases,
- casenumber first)
+psppire_data_store_delete_cases (PsppireDataStore *ds, casenumber first,
+ casenumber n_cases)
{
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
g_return_val_if_fail (first + n_cases <=
psppire_data_store_get_case_count (ds), FALSE);
+
datasheet_delete_rows (ds->datasheet, first, n_cases);
g_signal_emit (ds, signals [CASES_DELETED], 0, first, n_cases);
+ psppire_sheet_model_rows_deleted (PSPPIRE_SHEET_MODEL (ds), first, n_cases);
return TRUE;
}
struct ccase *cc,
casenumber posn)
{
- struct ccase tmp;
bool result ;
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
- case_clone (&tmp, cc);
- result = datasheet_insert_rows (ds->datasheet, posn, &tmp, 1);
+ case_ref (cc);
+ 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 [CASE_INSERTED], 0, posn);
+ psppire_sheet_model_rows_inserted (PSPPIRE_SHEET_MODEL (ds), posn, 1);
+ }
else
g_warning ("Cannot insert case at position %ld\n", posn);
ok = datasheet_put_value (ds->datasheet, casenum, idx, v, width);
if (ok)
g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum);
+
return ok;
}
&& data_in (input, LEGACY_NATIVE, fmt->type, 0, 0, 0, value, width)
&& datasheet_put_value (ds->datasheet, casenum, idx, value, width));
+ freea (value);
+
if (ok)
g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum);
- freea (value);
-
- return TRUE;
+ return ok;
}
/* Resize the cases in the casefile, by inserting N_VALUES into every
projects / pspp-builds.git / blobdiff