X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-sheet.c;h=c3e1fc2b2465f0e60c4cfd95239212d9ef8da894;hb=adb34911aef637e26876553de28053af9d21cdd1;hp=ac3a99e027cccdcd719c6f135efd904dc20f9741;hpb=d97c0f1ed2858c48173c023964cec8234b5bc831;p=pspp

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index ac3a99e027..c3e1fc2b24 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, 2020  Free Software Foundation
 
    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)
@@ -27,6 +28,7 @@
 #include "ui/gui/executor.h"
 #include "psppire-data-window.h"
 #include "ssw-axis-model.h"
+#include "helper.h"
 
 static void
 do_sort (PsppireDataSheet *sheet, GtkSortType order)
@@ -103,14 +105,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);
-
 
 
 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);
@@ -165,6 +164,10 @@ create_data_row_header_popup_menu (PsppireDataSheet *sheet)
 {
   GtkWidget *menu = gtk_menu_new ();
 
+  /* gtk_menu_shell_append does not sink/ref this object,
+     so we must do it ourselves (and remember to unref it).  */
+  g_object_ref_sink (menu);
+
   GtkWidget *item =
     gtk_menu_item_new_with_mnemonic  (_("_Insert Case"));
 
@@ -186,7 +189,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;
@@ -208,25 +211,39 @@ show_cases_column_popup (PsppireDataSheet *sheet, int column, uint button, uint
   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,27 +270,38 @@ 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;
 
   PsppireDataStore *data_store = NULL;
   g_object_get (sheet, "data-model", &data_store, NULL);
 
+  if (range->start_x > range->end_x)
+    {
+      gint temp = range->start_x;
+      range->start_x = range->end_x;
+      range->end_x = temp;
+    }
+
   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));
 }
 
-
-
 static GtkWidget *
 create_data_column_header_popup_menu (PsppireDataSheet *sheet)
 {
   GtkWidget *menu = gtk_menu_new ();
 
+  /* gtk_menu_shell_append does not sink/ref this object,
+     so we must do it ourselves (and remember to unref it).  */
+  g_object_ref_sink (menu);
+
   GtkWidget *item =
     gtk_menu_item_new_with_mnemonic  (_("_Insert Variable"));
   g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_variable),
@@ -286,7 +314,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);
@@ -321,25 +349,54 @@ G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, SSW_TYPE_SHEET)
 static GObjectClass * parent_class = NULL;
 static gboolean dispose_has_run = FALSE;
 
+static void
+psppire_data_sheet_finalize (GObject *obj)
+{
+  /* Chain up to the parent class */
+  G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
 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;
 
   dispose_has_run = TRUE;
 
+  g_object_unref (sheet->data_sheet_cases_column_popup);
+  g_object_unref (sheet->data_sheet_cases_row_popup);
+
   /* Chain up to the parent class */
   G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
+
+static void
+psppire_data_sheet_realize (GtkWidget *widget)
+{
+  g_object_set (widget,
+                "forward-conversion", psppire_data_store_value_to_string,
+                "reverse-conversion", psppire_data_store_string_to_value,
+                "editable", TRUE,
+                "horizontal-draggable", TRUE,
+                NULL);
+
+  /* Chain up to the parent class */
+  GTK_WIDGET_CLASS (parent_class)->realize (widget);
+}
+
 static void
 psppire_data_sheet_class_init (PsppireDataSheetClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  widget_class->realize = psppire_data_sheet_realize;
   object_class->dispose = psppire_data_sheet_dispose;
+  object_class->finalize = psppire_data_sheet_finalize;
 
   parent_class = g_type_class_peek_parent (class);
 }
@@ -347,15 +404,7 @@ psppire_data_sheet_class_init (PsppireDataSheetClass *class)
 GtkWidget*
 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,
-		  "editable", TRUE,
-		  "horizontal-draggable", TRUE,
-		  NULL);
-
-  return GTK_WIDGET (obj);
+  return g_object_new (PSPPIRE_TYPE_DATA_SHEET, NULL);
 }
 
 
@@ -378,7 +427,7 @@ indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
 }
 
 static void
-button_post_create (GtkWidget *button, uint i, gpointer user_data)
+button_post_create (GtkWidget *button, guint i, gpointer user_data)
 {
   PsppireDataStore *data_store = PSPPIRE_DATA_STORE (user_data);
 
@@ -386,15 +435,35 @@ button_post_create (GtkWidget *button, uint 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);
+  gdouble wm = width_of_m (GTK_WIDGET (sheet));
+
+  gint Ms = round ((size / wm) - 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)
 {
   GtkTreeModel *data_model = NULL;
   g_object_get (sheet, "data-model", &data_model, NULL);
 
+  g_return_if_fail (data_model);
+
   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);