X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-sheet.c;h=59268d21f431a3e569e8f7f3a4ddff654ebad02e;hb=37cd3133c06caf3fce7e449a939098f62bd41a55;hp=cf73ff454cfafe8746cc2b88668d765fb0bec2a2;hpb=06d2fb1005dc200634b8ecbe595c70ef15496194;p=pspp

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index cf73ff454c..59268d21f4 100644
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -26,11 +26,12 @@
 
 #include "ui/gui/executor.h"
 #include "psppire-data-window.h"
+#include "ssw-axis-model.h"
 
 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);
@@ -102,16 +103,9 @@ change_data_value (PsppireDataSheet *sheet, gint col, gint row, GValue *value)
   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);
 
-
 
 
 static void
@@ -155,7 +149,7 @@ insert_new_case (PsppireDataSheet *sheet)
 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);
@@ -236,7 +230,7 @@ insert_new_variable (PsppireDataSheet *sheet)
 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);
@@ -262,7 +256,7 @@ set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointe
 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);
@@ -322,7 +316,7 @@ create_data_column_header_popup_menu (PsppireDataSheet *sheet)
 
 
 
-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;
@@ -330,7 +324,7 @@ 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;
@@ -355,7 +349,7 @@ psppire_data_sheet_new (void)
 {
   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);
 
@@ -363,6 +357,76 @@ psppire_data_sheet_new (void)
 }
 
 
+static gboolean
+indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
+{
+  guint row = g_object_get_data (widget, "row");
+
+  if (!psppire_data_store_filtered (store, row))
+    return FALSE;
+
+  /* Draw a diagonal line through the widget */
+  guint width = gtk_widget_get_allocated_width (widget);
+  guint height = gtk_widget_get_allocated_height (widget);
+
+  GtkStyleContext *sc = gtk_widget_get_style_context (widget);
+  gtk_render_line (sc, cr, 0, 0, width, height);
+
+  return FALSE;
+}
+
+static void
+button_post_create (GtkWidget *button, uint i, gpointer user_data)
+{
+  PsppireDataStore *data_store = PSPPIRE_DATA_STORE (user_data);
+
+  g_object_set_data (button, "row", GUINT_TO_POINTER (i));
+  g_signal_connect_after (button, "draw", indicate_filtered_case, data_store);
+}
+
+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);
+
+
+  SswAxisModel *vmodel = NULL;
+  g_object_get (sheet, "vmodel", &vmodel, NULL);
+  g_assert (SSW_IS_AXIS_MODEL (vmodel));
+
+  g_object_set (vmodel,
+		"post-button-create-func", button_post_create,
+		"post-button-create-func-data", store,
+		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)
 {
@@ -383,4 +447,9 @@ 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);
 }