X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.c;h=2007c7bbc01c3ba5a06325cda1410b410a33e45b;hb=1c08d9ea96f931ed4330ad2b432cdf950d5b75bf;hp=9681a09f1be8813e1e14d7696839afd8f39cf743;hpb=4ea6e37d180c9412cbcd39afa48a516522e6dd71;p=pspp-builds.git diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c index 9681a09f..2007c7bb 100644 --- a/src/ui/gui/data-editor.c +++ b/src/ui/gui/data-editor.c @@ -33,11 +33,24 @@ #include "split-file-dialog.h" #include "transpose-dialog.h" #include "sort-cases-dialog.h" +#include "select-cases-dialog.h" #include "compute-dialog.h" #include "goto-case-dialog.h" +#include "find-dialog.h" +#include "rank-dialog.h" +#include "recode-dialog.h" #include "comments-dialog.h" #include "variable-info-dialog.h" +#include "descriptives-dialog.h" +#include "crosstabs-dialog.h" +#include "frequencies-dialog.h" #include "dict-display.h" +#include "clipboard.h" + +#include "oneway-anova-dialog.h" +#include "t-test-independent-samples-dialog.h" +#include "t-test-one-sample.h" +#include "t-test-paired-samples.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -45,12 +58,17 @@ #include "data-editor.h" #include "syntax-editor.h" #include +#include #include #include "window-manager.h" #include "psppire-data-store.h" #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 *); @@ -85,7 +103,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); @@ -154,6 +172,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 @@ -216,6 +255,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; /* @@ -245,6 +374,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 */ @@ -274,12 +411,22 @@ new_data_editor (void) connect_help (de->xml); + + g_signal_connect (get_widget_assert (de->xml, "edit_copy"), + "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); de->toggle_value_labels = gtk_toggle_action_new ("toggle-value-labels", _("Labels"), - _("Show (hide) value labels"), + _("Show/hide value labels"), "pspp-value-labels"); g_signal_connect (de->toggle_value_labels, "activate", @@ -307,6 +454,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); @@ -340,7 +489,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") ); @@ -360,7 +509,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") ); @@ -377,7 +526,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") ); @@ -427,6 +576,15 @@ new_data_editor (void) g_signal_connect (de->invoke_sort_cases_dialog, "activate", G_CALLBACK (sort_cases_dialog), de); + de->invoke_select_cases_dialog = + gtk_action_new ("select-cases-dialog", + _("Select Cases"), + _("Select cases from the active file"), + "pspp-select-cases"); + + g_signal_connect (de->invoke_select_cases_dialog, "activate", + G_CALLBACK (select_cases_dialog), de); + de->invoke_compute_dialog = gtk_action_new ("compute-dialog", @@ -437,6 +595,45 @@ 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_t_test_paired_samples_dialog = + gtk_action_new ("t-test-paired-samples", + _("_Paired Samples T Test"), + _("Calculate T Test for paired samples"), + NULL); + + g_signal_connect (de->invoke_t_test_paired_samples_dialog, "activate", + G_CALLBACK (t_test_paired_samples_dialog), de); + + + de->invoke_t_test_one_sample_dialog = + gtk_action_new ("t-test-one-sample", + _("One _Sample T Test"), + _("Calculate T Test for sample from a single distribution"), + NULL); + + g_signal_connect (de->invoke_t_test_one_sample_dialog, "activate", + G_CALLBACK (t_test_one_sample_dialog), de); + + de->invoke_comments_dialog = gtk_action_new ("commments-dialog", _("Data File Comments"), @@ -446,6 +643,46 @@ 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_recode_same_dialog = + gtk_action_new ("recode-same-dialog", + _("Recode into _Same Variables"), + _("Recode values into the same Variables"), + "pspp-recode-same"); + + g_signal_connect (de->invoke_recode_same_dialog, "activate", + G_CALLBACK (recode_same_dialog), de); + + + de->invoke_recode_different_dialog = + gtk_action_new ("recode-different-dialog", + _("Recode into _Different Variables"), + _("Recode values into different Variables"), + "pspp-recode-different"); + + g_signal_connect (de->invoke_recode_different_dialog, "activate", + G_CALLBACK (recode_different_dialog), de); + + de->invoke_variable_info_dialog = gtk_action_new ("variable-info-dialog", _("Variables"), @@ -455,6 +692,35 @@ 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); + + + de->invoke_frequencies_dialog = + gtk_action_new ("frequencies-dialog", + _("_Frequencies"), + _("Generate frequency statistics"), + "pspp-frequencies"); + + g_signal_connect (de->invoke_frequencies_dialog, "activate", + G_CALLBACK (frequencies_dialog), de); + + de->invoke_crosstabs_dialog = + gtk_action_new ("crosstabs-dialog", + _("_Crosstabs"), + _("Generate crosstabulations"), + "pspp-crosstabs"); + + g_signal_connect (de->invoke_crosstabs_dialog, "activate", + G_CALLBACK (crosstabs_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"), @@ -467,7 +733,6 @@ new_data_editor (void) G_CALLBACK (gtk_action_activate), de->action_data_open); - #if RECENT_LISTS_AVAILABLE { GtkRecentManager *rm = gtk_recent_manager_get_default (); @@ -531,6 +796,28 @@ 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_recode_same_dialog, + get_widget_assert (de->xml, + "transform_recode-same") + ); + + gtk_action_connect_proxy (de->invoke_recode_different_dialog, + get_widget_assert (de->xml, + "transform_recode-different") + ); + gtk_action_connect_proxy (de->invoke_weight_cases_dialog, get_widget_assert (de->xml, "data_weight-cases") ); @@ -547,10 +834,38 @@ new_data_editor (void) get_widget_assert (de->xml, "data_sort-cases") ); + gtk_action_connect_proxy (de->invoke_select_cases_dialog, + get_widget_assert (de->xml, "data_select-cases") + ); + gtk_action_connect_proxy (de->invoke_compute_dialog, 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_t_test_paired_samples_dialog, + get_widget_assert (de->xml, + "paired-t-test") + ); + + + gtk_action_connect_proxy (de->invoke_t_test_one_sample_dialog, + get_widget_assert (de->xml, + "one-sample-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") ); @@ -559,6 +874,18 @@ 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") + ); + + gtk_action_connect_proxy (de->invoke_crosstabs_dialog, + get_widget_assert (de->xml, "crosstabs") + ); + + gtk_action_connect_proxy (de->invoke_frequencies_dialog, + get_widget_assert (de->xml, "analyze_frequencies") + ); + g_signal_connect (get_widget_assert (de->xml,"help_about"), "activate", G_CALLBACK (about_new), @@ -598,7 +925,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"), @@ -649,6 +976,11 @@ new_data_editor (void) get_widget_assert (de->xml, "button-split-file") ); + gtk_action_connect_proxy (de->invoke_select_cases_dialog, + get_widget_assert (de->xml, "button-select-cases") + ); + + g_signal_connect (get_widget_assert (de->xml, "file_quit"), "activate", G_CALLBACK (file_quit), de); @@ -672,12 +1004,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; } @@ -741,9 +1067,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) @@ -764,7 +1090,7 @@ data_var_select (GtkNotebook *notebook, break; case PAGE_DATA_SHEET: gtk_widget_show (view_variables); - gtk_widget_hide (view_data); + gtk_widget_show (view_data); gtk_action_set_sensitive (de->invoke_goto_dialog, TRUE); gtk_action_set_sensitive (de->insert_case, TRUE); break; @@ -772,6 +1098,9 @@ data_var_select (GtkNotebook *notebook, g_assert_not_reached (); break; } + + update_paste_menuitem (de, page_num); + update_cut_copy_menuitem (de, page_num); } @@ -884,6 +1213,7 @@ toggle_value_labels (GtkToggleAction *ta, gpointer data) gtk_toggle_action_get_active (ta)); } +extern PsppireDataStore *the_data_store ; static void file_quit (GtkCheckMenuItem *menuitem, gpointer data) @@ -891,6 +1221,7 @@ file_quit (GtkCheckMenuItem *menuitem, gpointer data) /* FIXME: Need to be more intelligent here. Give the user the opportunity to save any unsaved data. */ + g_object_unref (the_data_store); gtk_main_quit (); } @@ -1361,14 +1692,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 @@ -1419,19 +1753,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: @@ -1694,3 +2015,99 @@ popup_cases_menu (GtkSheet *sheet, gint row, event->button, event->time); } } + + +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) +{ + struct data_editor *de = data; + + GtkSheet *data_sheet = GTK_SHEET (get_widget_assert (de->xml, + "data_sheet")); + + data_sheet_set_clip (data_sheet); +} + + + +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); +} + +