X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.c;h=818cbd07b5ef29e9810a5b886e229791d1f82411;hb=7751519f5ca0b6106fe3d611010a70804677ab86;hp=50c181ee6da726fb37fc14a0858e85a7340398f4;hpb=7ed50d6a12512276156477061ba54ba4836f2831;p=pspp-builds.git

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index 50c181ee..818cbd07 100644
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -36,17 +36,25 @@
 #include "select-cases-dialog.h"
 #include "compute-dialog.h"
 #include "goto-case-dialog.h"
+#include "find-dialog.h"
+#include "rank-dialog.h"
 #include "comments-dialog.h"
 #include "variable-info-dialog.h"
+#include "descriptives-dialog.h"
 #include "dict-display.h"
 #include "clipboard.h"
 
+
+#include "oneway-anova-dialog.h"
+#include "t-test-independent-samples-dialog.h"
+
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 #include "data-editor.h"
 #include "syntax-editor.h"
 #include <language/syntax-string-source.h>
+#include <language/command.h>
 #include <libpspp/syntax-gen.h>
 #include "window-manager.h"
 
@@ -54,6 +62,9 @@
 #include "psppire-var-store.h"
 
 static void on_edit_copy (GtkMenuItem *, gpointer);
+static void on_edit_cut (GtkMenuItem *, gpointer);
+static void on_edit_paste (GtkAction *a, gpointer data);
+
 
 static void create_data_sheet_variable_popup_menu (struct data_editor *);
 static void create_data_sheet_cases_popup_menu (struct data_editor *);
@@ -88,7 +99,7 @@ static void on_weight_change (GObject *, gint, gpointer);
 static void on_filter_change (GObject *, gint, gpointer);
 static void on_split_change (PsppireDict *, gpointer);
 
-static void data_var_select (GtkNotebook *notebook,
+static void on_switch_sheet (GtkNotebook *notebook,
 			    GtkNotebookPage *page,
 			    guint page_num,
 			    gpointer user_data);
@@ -157,6 +168,27 @@ transformation_change_callback (bool transformations_pending,
 static void open_data_file (const gchar *, struct data_editor *);
 
 
+/* Puts FILE_NAME into the recent list.
+   If it's already in the list, it moves it to the top
+*/
+static void
+add_most_recent (const char *file_name)
+{
+#if RECENT_LISTS_AVAILABLE
+
+  GtkRecentManager *manager = gtk_recent_manager_get_default();
+  gchar *uri = g_filename_to_uri (file_name, NULL, NULL);
+
+  gtk_recent_manager_remove_item (manager, uri, NULL);
+
+  if ( ! gtk_recent_manager_add_item (manager, uri))
+    g_warning ("Could not add item %s to recent list\n",uri);
+
+  g_free (uri);
+#endif
+}
+
+
 
 #if RECENT_LISTS_AVAILABLE
 
@@ -219,6 +251,96 @@ datum_entry_activate (GtkEntry *entry, gpointer data)
   psppire_data_store_set_string (store, text, row, column);
 }
 
+
+/* Update the Edit->Paste menuitem
+   If PAGE is not -1 , then it should be set to the current page of
+   the data editors notebook widget.
+   If -1, then it'll be queried.
+*/
+static void
+update_paste_menuitem (struct data_editor *de, gint page)
+{
+  GtkWidget * edit_paste = get_widget_assert (de->xml, "edit_paste");
+  GtkWidget *notebook = get_widget_assert (de->xml, "notebook");
+  GtkSheet * data_sheet ;
+  gint row, column;
+
+  if ( page < 0 )
+    page = gtk_notebook_get_current_page (GTK_NOTEBOOK(notebook));
+
+
+  if ( PAGE_VAR_SHEET == page )
+    {
+      /* We don't yet support pasting to the var sheet */
+      gtk_widget_set_sensitive (edit_paste, FALSE);
+      return;
+    }
+
+  data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
+
+  gtk_sheet_get_active_cell (data_sheet, &row, &column);
+
+  if ( row < 0 || column < 0 )
+      gtk_widget_set_sensitive (edit_paste, FALSE);
+  else
+      gtk_widget_set_sensitive (edit_paste, TRUE);
+}
+
+/* Update the Edit->Cut and Edit->Copy menuitems
+   If PAGE is not -1 , then it should be set to the current page of
+   the data editors notebook widget.
+   If -1, then it'll be queried.
+*/
+static void
+update_cut_copy_menuitem (struct data_editor *de, gint page)
+{
+  GtkWidget * edit_copy = get_widget_assert (de->xml, "edit_copy");
+  GtkWidget * edit_cut = get_widget_assert (de->xml, "edit_cut");
+  GtkWidget *notebook = get_widget_assert (de->xml, "notebook");
+  GtkSheet * data_sheet ;
+  gint row, column;
+
+  if ( page < 0 )
+    page = gtk_notebook_get_current_page (GTK_NOTEBOOK(notebook));
+
+
+  if ( PAGE_VAR_SHEET == page )
+    {
+      /* We don't yet support copying from the var sheet */
+      gtk_widget_set_sensitive (edit_copy, FALSE);
+      gtk_widget_set_sensitive (edit_cut, FALSE);
+      return;
+    }
+
+  data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
+
+  gtk_sheet_get_active_cell (data_sheet, &row, &column);
+
+  if ( row < 0 || column < 0 )
+    {
+      gtk_widget_set_sensitive (edit_copy, FALSE);
+      gtk_widget_set_sensitive (edit_cut, FALSE);
+      return;
+    }
+
+  gtk_widget_set_sensitive (edit_copy, TRUE);
+  gtk_widget_set_sensitive (edit_cut, TRUE);
+}
+
+
+/* Callback for when the datasheet's active cell becomes active/inactive */
+static gboolean
+on_data_sheet_activate_change (GtkSheet *sheet,
+			       gint row, gint column, gpointer data)
+{
+  struct data_editor *de = data;
+
+  update_paste_menuitem (de, -1);
+  update_cut_copy_menuitem (de, -1);
+
+  return TRUE;
+}
+
 extern struct dataset *the_dataset;
 
 /*
@@ -248,6 +370,14 @@ new_data_editor (void)
   var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
   data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
 
+
+  g_signal_connect (G_OBJECT (data_sheet), "activate",
+		    G_CALLBACK (on_data_sheet_activate_change), de);
+
+  g_signal_connect (G_OBJECT (data_sheet), "deactivate",
+		    G_CALLBACK (on_data_sheet_activate_change), de);
+
+
   vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
 
   g_assert(vs); /* Traps a possible bug in win32 build */
@@ -282,6 +412,10 @@ new_data_editor (void)
 		    "activate",
 		    G_CALLBACK (on_edit_copy), de);
 
+  g_signal_connect (get_widget_assert (de->xml, "edit_cut"),
+		    "activate",
+		    G_CALLBACK (on_edit_cut), de);
+
 
   register_data_editor_actions (de);
 
@@ -316,6 +450,8 @@ new_data_editor (void)
   gtk_action_connect_proxy (de->delete_cases,
 			    get_widget_assert (de->xml, "edit_clear-cases"));
 
+  g_signal_connect (get_widget_assert (de->xml, "edit_paste"), "activate",
+		    G_CALLBACK (on_edit_paste), de);
 
   gtk_action_set_visible (de->delete_cases, FALSE);
 
@@ -349,7 +485,7 @@ new_data_editor (void)
 			    );
 
   gtk_action_connect_proxy (de->insert_variable,
-			    get_widget_assert (de->xml, "data_insert-variable")
+			    get_widget_assert (de->xml, "edit_insert-variable")
 			    );
 
 
@@ -369,7 +505,7 @@ new_data_editor (void)
 
 
   gtk_action_connect_proxy (de->insert_case,
-			    get_widget_assert (de->xml, "data_insert-case")
+			    get_widget_assert (de->xml, "edit_insert-case")
 			    );
 
 
@@ -386,7 +522,7 @@ new_data_editor (void)
 			    );
 
   gtk_action_connect_proxy (de->invoke_goto_dialog,
-			    get_widget_assert (de->xml, "data_goto-case")
+			    get_widget_assert (de->xml, "edit_goto-case")
 			    );
 
 
@@ -455,6 +591,25 @@ new_data_editor (void)
   g_signal_connect (de->invoke_compute_dialog, "activate",
 		    G_CALLBACK (compute_dialog), de);
 
+  de->invoke_oneway_anova_dialog =
+    gtk_action_new ("oneway-anova",
+		    _("Oneway _ANOVA"),
+		    _("Perform one way analysis of variance"),
+		    NULL);
+
+  g_signal_connect (de->invoke_oneway_anova_dialog, "activate",
+		    G_CALLBACK (oneway_anova_dialog), de);
+
+  de->invoke_t_test_independent_samples_dialog =
+    gtk_action_new ("t-test-independent-samples",
+		    _("_Independent Samples T Test"),
+		    _("Calculate T Test for samples from independent groups"),
+		    NULL);
+
+  g_signal_connect (de->invoke_t_test_independent_samples_dialog, "activate",
+		    G_CALLBACK (t_test_independent_samples_dialog), de);
+
+
   de->invoke_comments_dialog =
     gtk_action_new ("commments-dialog",
 		    _("Data File Comments"),
@@ -464,6 +619,26 @@ new_data_editor (void)
   g_signal_connect (de->invoke_comments_dialog, "activate",
 		    G_CALLBACK (comments_dialog), de);
 
+  de->invoke_find_dialog  =
+    gtk_action_new ("find-dialog",
+		    _("Find"),
+		    _("Find Case"),
+		    "gtk-find");
+
+  g_signal_connect (de->invoke_find_dialog, "activate",
+		    G_CALLBACK (find_dialog), de);
+
+
+  de->invoke_rank_dialog  =
+    gtk_action_new ("rank-dialog",
+		    _("Ran_k Cases"),
+		    _("Rank Cases"),
+		    "pspp-rank-cases");
+
+  g_signal_connect (de->invoke_rank_dialog, "activate",
+		    G_CALLBACK (rank_dialog), de);
+
+
   de->invoke_variable_info_dialog  =
     gtk_action_new ("variable-info-dialog",
 		    _("Variables"),
@@ -473,6 +648,15 @@ new_data_editor (void)
   g_signal_connect (de->invoke_variable_info_dialog, "activate",
 		    G_CALLBACK (variable_info_dialog), de);
 
+  de->invoke_descriptives_dialog =
+    gtk_action_new ("descriptives-dialog",
+		    _("_Descriptives"),
+		    _("Calculate descriptive statistics (mean, variance, ...)"),
+		    "pspp-descriptives");
+
+  g_signal_connect (de->invoke_descriptives_dialog, "activate",
+		    G_CALLBACK (descriptives_dialog), de);
+
   e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
 
   g_signal_connect_swapped (get_widget_assert (de->xml,"file_new_data"),
@@ -549,6 +733,18 @@ new_data_editor (void)
 			    G_CALLBACK (gtk_action_activate),
 			    de->action_data_save_as);
 
+  gtk_action_connect_proxy (de->invoke_find_dialog,
+			    get_widget_assert (de->xml, "edit_find")
+			    );
+
+  gtk_action_connect_proxy (de->invoke_find_dialog,
+			    get_widget_assert (de->xml, "button-find")
+			    );
+
+  gtk_action_connect_proxy (de->invoke_rank_dialog,
+			    get_widget_assert (de->xml, "transform_rank")
+			    );
+
   gtk_action_connect_proxy (de->invoke_weight_cases_dialog,
 			    get_widget_assert (de->xml, "data_weight-cases")
 			    );
@@ -573,6 +769,18 @@ new_data_editor (void)
 			    get_widget_assert (de->xml, "transform_compute")
 			    );
 
+  gtk_action_connect_proxy (de->invoke_t_test_independent_samples_dialog,
+			    get_widget_assert (de->xml,
+					       "indep-t-test")
+			    );
+
+
+  gtk_action_connect_proxy (de->invoke_oneway_anova_dialog,
+			    get_widget_assert (de->xml,
+					       "oneway-anova")
+			    );
+
+
   gtk_action_connect_proxy (de->invoke_comments_dialog,
 			    get_widget_assert (de->xml, "utilities_comments")
 			    );
@@ -581,6 +789,10 @@ new_data_editor (void)
 			    get_widget_assert (de->xml, "utilities_variables")
 			    );
 
+  gtk_action_connect_proxy (de->invoke_descriptives_dialog,
+			    get_widget_assert (de->xml, "analyze_descriptives")
+			    );
+
   g_signal_connect (get_widget_assert (de->xml,"help_about"),
 		    "activate",
 		    G_CALLBACK (about_new),
@@ -620,7 +832,7 @@ new_data_editor (void)
 
   g_signal_connect (get_widget_assert (de->xml, "notebook"),
 		    "switch-page",
-		    G_CALLBACK (data_var_select), de);
+		    G_CALLBACK (on_switch_sheet), de);
 
 
   g_signal_connect (get_widget_assert (de->xml, "view_statusbar"),
@@ -699,12 +911,6 @@ new_data_editor (void)
   g_signal_connect (G_OBJECT (data_sheet), "button-event-row",
 		    G_CALLBACK (popup_cases_menu), de);
 
-     /* The "switch-page" signal does get emitted unless the page actually 
-	changes.  But the state is indeterminate at startup.  Therefore we 
-	must explicitly change it to one state, then the other */
-  data_editor_select_sheet (de, PAGE_VAR_SHEET);
-  data_editor_select_sheet (de, PAGE_DATA_SHEET);
-
   return de;
 }
 
@@ -768,9 +974,9 @@ new_data_window (GtkMenuItem *menuitem, gpointer parent)
   window_create (WINDOW_DATA, NULL);
 }
 
-
+/* Callback for when the datasheet/varsheet is selected */
 static void
-data_var_select (GtkNotebook *notebook,
+on_switch_sheet (GtkNotebook *notebook,
 		GtkNotebookPage *page,
 		guint page_num,
 		gpointer user_data)
@@ -779,14 +985,12 @@ data_var_select (GtkNotebook *notebook,
 
   GtkWidget *view_data = get_widget_assert (de->xml, "view_data");
   GtkWidget *view_variables = get_widget_assert (de->xml, "view_variables");
-  GtkWidget *edit_copy = get_widget_assert (de->xml, "edit_copy");
 
   switch (page_num)
     {
     case PAGE_VAR_SHEET:
       gtk_widget_hide (view_variables);
       gtk_widget_show (view_data);
-      gtk_widget_set_sensitive (edit_copy, FALSE);
       gtk_action_set_sensitive (de->insert_variable, TRUE);
       gtk_action_set_sensitive (de->insert_case, FALSE);
       gtk_action_set_sensitive (de->invoke_goto_dialog, FALSE);
@@ -796,12 +1000,14 @@ data_var_select (GtkNotebook *notebook,
       gtk_widget_show (view_data);
       gtk_action_set_sensitive (de->invoke_goto_dialog, TRUE);
       gtk_action_set_sensitive (de->insert_case, TRUE);
-      gtk_widget_set_sensitive (edit_copy, TRUE);
       break;
     default:
       g_assert_not_reached ();
       break;
     }
+
+  update_paste_menuitem (de, page_num);
+  update_cut_copy_menuitem (de, page_num);
 }
 
 
@@ -1391,14 +1597,17 @@ open_data_file (const gchar *file_name, struct data_editor *de)
 
   sss = create_syntax_string_source ("GET FILE=%s.",
 				     ds_cstr (&filename));
-
-  execute_syntax (sss);
   ds_destroy (&filename);
 
-  window_set_name_from_filename ((struct editor_window *) de, file_name);
+  if (execute_syntax (sss) )
+  {
+    window_set_name_from_filename ((struct editor_window *) de, file_name);
+    add_most_recent (file_name);
+  }
 }
 
 
+
 /* Callback for the data_open action.
    Prompts for a filename and opens it */
 static void
@@ -1449,19 +1658,6 @@ open_data_dialog (GtkAction *action, struct data_editor *de)
 	  gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 
 	open_data_file (de->file_name, de);
-
-#if RECENT_LISTS_AVAILABLE
-	{
-	  GtkRecentManager *manager = gtk_recent_manager_get_default();
-	  gchar *uri = g_filename_to_uri (de->file_name, NULL, NULL);
-
-	  if ( ! gtk_recent_manager_add_item (manager, uri))
-	    g_warning ("Could not add item %s to recent list\n",uri);
-
-	  g_free (uri);
-	}
-#endif
-
       }
       break;
     default:
@@ -1726,6 +1922,17 @@ popup_cases_menu (GtkSheet *sheet, gint row,
 }
 
 
+static void
+on_edit_paste (GtkAction *a, gpointer data)
+{
+  GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+
+  gtk_clipboard_request_contents (clipboard,
+				  gdk_atom_intern ("UTF8_STRING", TRUE),
+				  data_sheet_contents_received_callback,
+				  data);
+}
+
 
 static void
 on_edit_copy (GtkMenuItem *m, gpointer data)
@@ -1739,3 +1946,73 @@ on_edit_copy (GtkMenuItem *m, gpointer data)
 }
 
 
+
+static void
+on_edit_cut (GtkMenuItem *m, gpointer data)
+{
+  struct data_editor *de = data;
+  gint max_rows, max_columns;
+  gint r;
+  GtkSheetRange range;
+  PsppireDataStore *ds;
+  GtkSheet *data_sheet = GTK_SHEET (get_widget_assert (de->xml,
+						       "data_sheet"));
+
+  data_sheet_set_clip (data_sheet);
+
+
+  /* Now blank all the cells */
+  gtk_sheet_get_selected_range (data_sheet, &range);
+
+  ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
+
+
+   /* If nothing selected, then use active cell */
+  if ( range.row0 < 0 || range.col0 < 0 )
+    {
+      gint row, col;
+      gtk_sheet_get_active_cell (data_sheet, &row, &col);
+
+      range.row0 = range.rowi = row;
+      range.col0 = range.coli = col;
+    }
+
+  /* The sheet range can include cells that do not include data.
+     Exclude them from the range. */
+  max_rows = psppire_data_store_get_case_count (ds);
+  if (range.rowi >= max_rows)
+    {
+      if (max_rows == 0)
+        return;
+      range.rowi = max_rows - 1;
+    }
+
+  max_columns = dict_get_var_cnt (ds->dict->dict);
+  if (range.coli >= max_columns)
+    {
+      if (max_columns == 0)
+        return;
+      range.coli = max_columns - 1;
+    }
+
+  g_return_if_fail (range.rowi >= range.row0);
+  g_return_if_fail (range.row0 >= 0);
+  g_return_if_fail (range.coli >= range.col0);
+  g_return_if_fail (range.col0 >= 0);
+
+
+  for (r = range.row0; r <= range.rowi ; ++r )
+    {
+      gint c;
+
+      for (c = range.col0 ; c <= range.coli; ++c)
+	{
+	  psppire_data_store_set_string (ds, "", r, c);
+	}
+    }
+
+  /* and remove the selection */
+  gtk_sheet_unselect_range (data_sheet);
+}
+
+