X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-sheet.c;h=8cc32859a4f1c90c81ad3149d8304da28a94deca;hb=86454c8ab63804d02cb4f08e8b5e45299b8eb810;hp=983fa68998fdd5c7d83df29691ecae1bac208e49;hpb=d4ff0e074d703dbeb8af5aa3ac470ddda5ebe301;p=pspp

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 983fa68998..8cc32859a4 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,21 +103,14 @@ 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
 show_cases_row_popup (PsppireDataSheet *sheet, int row,
-		      uint button, uint state, gpointer p)
+		      guint button, guint state, gpointer p)
 {
   GListModel *vmodel = NULL;
   g_object_get (sheet, "vmodel", &vmodel, NULL);
@@ -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);
@@ -192,7 +186,7 @@ create_data_row_header_popup_menu (PsppireDataSheet *sheet)
 
 
 static void
-show_cases_column_popup (PsppireDataSheet *sheet, int column, uint button, uint state,
+show_cases_column_popup (PsppireDataSheet *sheet, int column, guint button, guint state,
 			 gpointer p)
 {
   GListModel *hmodel = 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;
@@ -355,13 +349,43 @@ 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,
+		  "editable", TRUE,
+		  "horizontal-draggable", TRUE,
 		  NULL);
 
   return GTK_WIDGET (obj);
 }
 
+
+static gboolean
+indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
+{
+  guint row = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (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, guint i, gpointer user_data)
+{
+  PsppireDataStore *data_store = PSPPIRE_DATA_STORE (user_data);
+
+  g_object_set_data (G_OBJECT (button), "row", GUINT_TO_POINTER (i));
+  g_signal_connect_after (button, "draw", G_CALLBACK (indicate_filtered_case), data_store);
+}
+
 static void
 set_dictionary (PsppireDataSheet *sheet)
 {
@@ -370,6 +394,16 @@ set_dictionary (PsppireDataSheet *sheet)
 
   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