/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2017 John Darrington
+ Copyright (C) 2017, 2019 John Darrington
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
#include "psppire-data-sheet.h"
+#include <math.h>
#include <gettext.h>
#define _(msgid) gettext (msgid)
#include "ui/gui/executor.h"
#include "psppire-data-window.h"
+#include "ssw-axis-model.h"
static void
do_sort (PsppireDataSheet *sheet, GtkSortType order)
value_destroy_from_variant (&v, vrnt);
}
-static gchar *
-data_store_value_to_string (SswSheet *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
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);
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;
gtk_menu_popup_at_pointer (GTK_MENU (sheet->data_sheet_cases_column_popup), NULL);
}
-static void
-insert_new_variable (PsppireDataSheet *sheet)
+/* Insert a new variable before the variable at POSN. */
+void
+psppire_data_sheet_insert_new_variable_at_posn (PsppireDataSheet *sheet,
+ gint posn)
{
PsppireDataStore *data_store = NULL;
g_object_get (sheet, "data-model", &data_store, NULL);
- gint posn = GPOINTER_TO_INT (g_object_get_data
- (G_OBJECT (sheet->data_sheet_cases_column_popup),
- "item"));
-
const struct variable *v = psppire_dict_insert_variable (data_store->dict,
posn, NULL);
psppire_data_store_insert_value (data_store, var_get_width(v),
var_get_case_index (v));
+ ssw_sheet_scroll_to (SSW_SHEET (sheet), posn, -1);
+
gtk_widget_queue_draw (GTK_WIDGET (sheet));
}
+static void
+insert_new_variable (PsppireDataSheet *sheet)
+{
+ PsppireDataStore *data_store = NULL;
+ g_object_get (sheet, "data-model", &data_store, NULL);
+
+ gint posn = GPOINTER_TO_INT (g_object_get_data
+ (G_OBJECT (sheet->data_sheet_cases_column_popup),
+ "item"));
+
+ psppire_data_sheet_insert_new_variable_at_posn (sheet, posn);
+}
+
+
static void
set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointer p)
{
whole_column_selected);
}
-static void
-delete_variables (PsppireDataSheet *sheet)
+void
+psppire_data_sheet_delete_variables (PsppireDataSheet *sheet)
{
SswRange *range = SSW_SHEET(sheet)->selection;
psppire_dict_delete_variables (data_store->dict, range->start_x,
(range->end_x - range->start_x + 1));
+ ssw_sheet_scroll_to (SSW_SHEET (sheet), range->start_x, -1);
+
gtk_widget_queue_draw (GTK_WIDGET (sheet));
}
sheet->data_clear_variables_menu_item =
gtk_menu_item_new_with_mnemonic (_("Cl_ear Variables"));
g_signal_connect_swapped (sheet->data_clear_variables_menu_item, "activate",
- G_CALLBACK (delete_variables),
+ G_CALLBACK (psppire_data_sheet_delete_variables),
sheet);
gtk_widget_set_sensitive (sheet->data_clear_variables_menu_item, FALSE);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), sheet->data_clear_variables_menu_item);
{
GObject *obj =
g_object_new (PSPPIRE_TYPE_DATA_SHEET,
- "forward-conversion", data_store_value_to_string,
- "reverse-conversion", myreversefunc,
+ "forward-conversion", psppire_data_store_value_to_string,
+ "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)
{
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
projects / pspp / blobdiff