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

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 8cc32859a4..3774bfbfd8 100644
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -1,5 +1,5 @@
 /* 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
@@ -17,6 +17,7 @@
 
 #include <config.h>
 #include "psppire-data-sheet.h"
+#include <math.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -103,9 +104,6 @@ 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);
-
 
 
 static void
@@ -208,25 +206,39 @@ show_cases_column_popup (PsppireDataSheet *sheet, int column, guint button, guin
   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)
 {
@@ -253,8 +265,8 @@ set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointe
 			    whole_column_selected);
 }
 
-static void
-delete_variables (PsppireDataSheet *sheet)
+void
+psppire_data_sheet_delete_variables (PsppireDataSheet *sheet)
 {
   SswRange *range = SSW_SHEET(sheet)->selection;
 
@@ -264,6 +276,8 @@ delete_variables (PsppireDataSheet *sheet)
   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));
 }
 
@@ -286,7 +300,7 @@ create_data_column_header_popup_menu (PsppireDataSheet *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);
@@ -350,7 +364,7 @@ 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);
@@ -386,6 +400,33 @@ button_post_create (GtkWidget *button, guint i, gpointer user_data)
   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)
 {
@@ -395,6 +436,8 @@ 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);