static void
do_sort (PsppireDataSheet *sheet, GtkSortType order)
{
- JmdRange *range = JMD_SHEET(sheet)->selection;
+ SswRange *range = SSW_SHEET(sheet)->selection;
PsppireDataStore *data_store = NULL;
g_object_get (sheet, "data-model", &data_store, NULL);
value_destroy_from_variant (&v, vrnt);
}
-static gchar *
-data_store_value_to_string (JmdSheet *data_sheet, PsppireDataStore *store, gint col, gint row, const GValue *v)
-{
- return psppire_data_store_value_to_string (store, col, row, v);
-}
-
gboolean myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in,
GValue *out);
-
\f
static void
static void
delete_cases (PsppireDataSheet *sheet)
{
- JmdRange *range = JMD_SHEET(sheet)->selection;
+ SswRange *range = SSW_SHEET(sheet)->selection;
PsppireDataStore *data_store = NULL;
g_object_get (sheet, "data-model", &data_store, NULL);
static void
set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointer p)
{
- JmdRange *range = selection;
+ SswRange *range = selection;
PsppireDataStore *data_store = NULL;
g_object_get (sheet, "data-model", &data_store, NULL);
static void
delete_variables (PsppireDataSheet *sheet)
{
- JmdRange *range = JMD_SHEET(sheet)->selection;
+ SswRange *range = SSW_SHEET(sheet)->selection;
PsppireDataStore *data_store = NULL;
g_object_get (sheet, "data-model", &data_store, NULL);
\f
-G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, JMD_TYPE_SHEET)
+G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, SSW_TYPE_SHEET)
static GObjectClass * parent_class = NULL;
static gboolean dispose_has_run = FALSE;
static void
psppire_data_sheet_dispose (GObject *obj)
{
- PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (obj);
+ // PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (obj);
if (dispose_has_run)
return;
{
GObject *obj =
g_object_new (PSPPIRE_TYPE_DATA_SHEET,
- "forward-conversion", data_store_value_to_string,
+ "forward-conversion", psppire_data_store_value_to_string,
"reverse-conversion", myreversefunc,
NULL);
return GTK_WIDGET (obj);
}
+static void
+set_dictionary (PsppireDataSheet *sheet)
+{
+ GtkTreeModel *data_model = NULL;
+ g_object_get (sheet, "data-model", &data_model, NULL);
+
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (data_model);
+ g_object_set (sheet, "hmodel", store->dict, NULL);
+}
+
+static void
+move_variable (PsppireDataSheet *sheet, gint from, gint to, gpointer ud)
+{
+ PsppireDataStore *data_store = NULL;
+ g_object_get (sheet, "data-model", &data_store, NULL);
+
+ if (data_store == NULL)
+ return;
+
+ PsppireDict *dict = data_store->dict;
+ struct variable *var = psppire_dict_get_variable (dict, from);
+
+ if (var == NULL)
+ return;
+ gint new_pos = to;
+ /* The index refers to the final position, so if the source
+ is less than the destination, then we must subtract 1, to
+ account for the position vacated by the source */
+ if (from < to)
+ new_pos--;
+ dict_reorder_var (dict->dict, var, new_pos);
+}
static void
psppire_data_sheet_init (PsppireDataSheet *sheet)
g_signal_connect (sheet, "value-changed",
G_CALLBACK (change_data_value), NULL);
+
+ g_signal_connect (sheet, "notify::data-model",
+ G_CALLBACK (set_dictionary), NULL);
+
+ g_signal_connect (sheet, "column-moved", G_CALLBACK (move_variable), NULL);
}