Rename myreversefunc -> psppire_data_store_string_to_value

[pspp] / src / ui / gui / psppire-data-sheet.c

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 089ab8f4795c5a8cf365fdd4f29c8c138fc88670..4b7df0dc287f5919b4b69a00e988976397ea9746 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -17,6 +17,7 @@
 
 #include <config.h>
 #include "psppire-data-sheet.h"
+#include <math.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -26,6 +27,7 @@
 
 #include "ui/gui/executor.h"
 #include "psppire-data-window.h"
+#include "ssw-axis-model.h"
 
 static void
 do_sort (PsppireDataSheet *sheet, GtkSortType order)
@@ -102,14 +104,11 @@ change_data_value (PsppireDataSheet *sheet, gint col, gint row, GValue *value)
   value_destroy_from_variant (&v, vrnt);
 }
 
-gboolean myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in,
-                   GValue *out);
-
 \f
 
 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);
@@ -185,7 +184,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;
@@ -349,12 +348,69 @@ psppire_data_sheet_new (void)
   GObject *obj =
     g_object_new (PSPPIRE_TYPE_DATA_SHEET,
                  "forward-conversion", psppire_data_store_value_to_string,
-                 "reverse-conversion", myreversefunc,
+                 "reverse-conversion", psppire_data_store_string_to_value,
+                 "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 gboolean
+resize_display_width (PsppireDict *dict, gint pos, gint size, gpointer user_data)
+{
+  if (pos < 0)
+    return FALSE;
+
+  PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (user_data);
+  PangoContext *context = gtk_widget_create_pango_context (GTK_WIDGET (sheet));
+  PangoLayout *layout = pango_layout_new (context);
+  PangoRectangle rect;
+  
+  pango_layout_set_text (layout, "M", 1);
+  pango_layout_get_extents (layout, NULL, &rect);
+  
+  gdouble width_of_M = rect.width / (gdouble) PANGO_SCALE;
+  
+  g_object_unref (G_OBJECT (layout));
+  g_object_unref (G_OBJECT (context));
+  
+  gint Ms = round ((size / width_of_M) - 0.25);
+  struct variable *var = psppire_dict_get_variable (dict, pos);
+  g_return_val_if_fail (var, TRUE);
+  var_set_display_width (var, Ms);
+  return TRUE;
+}
+
 static void
 set_dictionary (PsppireDataSheet *sheet)
 {
@@ -363,6 +419,18 @@ set_dictionary (PsppireDataSheet *sheet)
 
   PsppireDataStore *store = PSPPIRE_DATA_STORE (data_model);
   g_object_set (sheet, "hmodel", store->dict, NULL);
+
+  g_signal_connect (store->dict, "resize-item", G_CALLBACK (resize_display_width),
+                   sheet);
+
+  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