#include <data/variable.h>
#include <gtksheet/gsheetmodel.h>
+#include <gtksheet/psppire-marshal.h>
#include <pango/pango-context.h>
#include "xmalloca.h"
-enum cf_signal_handler {
- CASES_DELETED,
- CASE_INSERTED,
- CASE_CHANGED,
- n_cf_signals
-};
-
static void psppire_data_store_init (PsppireDataStore *data_store);
static void psppire_data_store_class_init (PsppireDataStoreClass *class);
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_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);
}
return psppire_dict_get_value_cnt (store->dict);
}
-casenumber
+static casenumber
psppire_data_store_get_case_count_wrapper (const GSheetModel *model)
{
const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
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);
-#if AXIS_TRANSITION
+
g_sheet_model_columns_deleted (G_SHEET_MODEL (store), dict_index, 1);
+#if AXIS_TRANSITION
+
g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
dict_index, -1);
}
+
static void
variable_changed_callback (GObject *obj, gint var_num, gpointer data)
{
psppire_data_store_insert_values (store, 1, posn);
#if AXIS_TRANSITION
+
g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
var_num, 1);
#endif
g_sheet_model_range_changed (G_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);
}
psppire_data_store_set_value (store, row, index, &v,
var_get_width (pv));
+ g_sheet_model_range_changed (model, row, col, row, col);
+
return TRUE;
}
var_get_case_index (pv), ss_cstr (text),
var_get_write_format (pv));
+ g_sheet_model_range_changed (G_SHEET_MODEL (store), row, col, row, col);
+
return TRUE;
}
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]);
}
- reader = datasheet_make_reader (ds->datasheet);
+ reader = datasheet_make_reader (ds->datasheet);
/* We must not reference this again */
ds->datasheet = NULL;
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);
+ g_sheet_model_rows_deleted (G_SHEET_MODEL (ds), first, n_cases);
return TRUE;
}
case_clone (&tmp, cc);
result = datasheet_insert_rows (ds->datasheet, posn, &tmp, 1);
- g_debug ("Result %d. Inserted case at posn %ld", result, posn);
if ( result )
- g_signal_emit (ds, signals [CASE_INSERTED], 0, posn);
+ {
+ g_signal_emit (ds, signals [CASE_INSERTED], 0, posn);
+ g_sheet_model_rows_inserted (G_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